0974642a7d35edfb39a06de8eff41387540c5023 galt Thu Apr 28 13:00:01 2022 -0700 oops, this Ext function is no longer needed. diff --git src/hg/lib/jksql.c src/hg/lib/jksql.c index 9e848c1..de8d383 100644 --- src/hg/lib/jksql.c +++ src/hg/lib/jksql.c @@ -4251,31 +4251,31 @@ * Escapes quoted string parameters. * NOSLQINJ tag is added to beginning. */ { int sz; va_list args; va_start(args, format); sz = vaSqlSafef(buffer, bufSize, format, args); va_end(args); return sz; } /* --------------------------- */ -void vaSqlDyStringPrintfExt(struct dyString *ds, char *format, va_list args) +void vaSqlDyStringPrintf(struct dyString *ds, char *format, va_list args) /* VarArgs Printf to end of dyString after scanning string parameters for illegal sql chars. * Strings inside quotes are automatically escaped. * NOSLQINJ tag is added to beginning if it is a new empty string. */ { /* attempt to format the string in the current space. If there * is not enough room, increase the buffer size and try again */ int avail, sz; while (TRUE) { va_list argscp; va_copy(argscp, args); avail = ds->bufSize - ds->stringSize; if (avail <= 0) { /* Don't pass zero sized buffers to vsnprintf, because who knows @@ -4292,39 +4292,30 @@ va_end(argscp); /* note that some version return -1 if too small */ if ((sz < 0) || (sz >= avail)) { dyStringBumpBufSize(ds, ds->bufSize+ds->bufSize); } else { ds->stringSize += sz; break; } } } -void vaSqlDyStringPrintf(struct dyString *ds, char *format, va_list args) -/* VarArgs Printf to end of dyString after scanning string parameters for illegal sql chars. - * Strings inside quotes are automatically escaped. - * NOSLQINJ tag is added to beginning if it is a new empty string. - * Appends to existing string. */ -{ -vaSqlDyStringPrintfExt(ds, format, args); -} - void sqlDyStringPrintf(struct dyString *ds, char *format, ...) /* Printf to end of dyString after scanning string parameters for illegal sql chars. * Strings inside quotes are automatically escaped. * NOSLQINJ tag is added to beginning if it is a new empty string. * Appends to existing string. */ { va_list args; va_start(args, format); vaSqlDyStringPrintf(ds, format, args); va_end(args); } struct dyString *sqlDyStringCreate(char *format, ...) /* Create a dyString with a printf style initial content * Adds the NOSQLINJ prefix. */