13b4184b2e434953f411f20dd87104f99b550275 hiram Fri Oct 2 11:53:27 2015 -0700 fixup gcc warnings for -Wunused-but-set-variable refs #16121 diff --git src/hg/lib/sqlProg.c src/hg/lib/sqlProg.c index a79a0ac..088e080 100644 --- src/hg/lib/sqlProg.c +++ src/hg/lib/sqlProg.c @@ -181,49 +181,50 @@ safef(homePath, sizeof homePath, "%s/%s", homeDir, file->name); remove(homePath); } } slFreeList(&fileList); } void sqlExecProgProfile(char *profile, char *prog, char **progArgs, int userArgc, char *userArgv[]) /* * Exec one of the sql programs using user and password defined in localDb.XXX variables from ~/.hg.conf * progArgs is NULL-terminate array of program-specific arguments to add, * which maybe NULL. userArgv are arguments passed in from the command line. * The program is execvp-ed, this function does not return. */ { -int i, j = 0, nargc=cntArgv(progArgs)+userArgc+6, defaultFileNo, returnStatus; +int i, j = 0, nargc=cntArgv(progArgs)+userArgc+6, returnStatus; pid_t child_id; char **nargv, defaultFileName[256], defaultFileArg[256], *homeDir; // install cleanup signal handlers sqlProgInitSigHandlers(); /* Assemble defaults file */ if ((homeDir = getenv("HOME")) == NULL) errAbort("sqlExecProgProfile: HOME is not defined in environment; cannot create temporary password file"); nukeOldCnfs(homeDir); // look for special parameter -profile=name for (i = 0; i < userArgc; i++) if (startsWith("-profile=", userArgv[i])) profile=cloneString(userArgv[i]+strlen("-profile=")); safef(defaultFileName, sizeof(defaultFileName), "%s/.hgsql.cnf-XXXXXX", homeDir); -defaultFileNo=sqlMakeDefaultsFile(defaultFileName, profile, "client"); +// discard returned fileNo +(void) sqlMakeDefaultsFile(defaultFileName, profile, "client"); safef(defaultFileArg, sizeof(defaultFileArg), "--defaults-file=%s", defaultFileName); AllocArray(nargv, nargc); nargv[j++] = prog; nargv[j++] = defaultFileArg; /* --defaults-file must come before other options */ if (progArgs != NULL) { for (i = 0; progArgs[i] != NULL; i++) nargv[j++] = progArgs[i]; } for (i = 0; i < userArgc; i++) if (!startsWith("-profile=", userArgv[i])) nargv[j++] = userArgv[i];