Unify naming of va_list variables to args or args_copy

lib/compat/snprintf.c

@@ -28,12 +28,12 @@
 int
 snprintf(char *str, size_t n, char const *fmt, ...)
 {
-	va_list ap;
+	va_list args;
 	int i;
 
-	va_start(ap, fmt);
-	i = vsnprintf(str, n, fmt, ap);
-	va_end(ap);
+	va_start(args, fmt);
+	i = vsnprintf(str, n, fmt, args);
+	va_end(args);
 
 	return i;
 }

lib/compat/vsnprintf.c

@@ -26,7 +26,7 @@
 
 #ifndef HAVE_VSNPRINTF
 int
-vsnprintf(char *buf, size_t maxsize, const char *fmt, va_list al)
+vsnprintf(char *buf, size_t maxsize, const char *fmt, va_list args)
 {
 	static FILE *file = NULL;
 
@@ -47,7 +47,7 @@ vsnprintf(char *buf, size_t maxsize, const char *fmt, va_list al)
 			return -1;
 	}
 
-	total = vfprintf(file, fmt, al);
+	total = vfprintf(file, fmt, args);
 	if (total < 0)
 		return -1;
 	if (maxsize == 0)

lib/dpkg/buffer.c

@@ -160,7 +160,7 @@ buffer_copy_##name(type1 n1, int typeIn, \
                    type2 n2, int typeOut, \
                    off_t limit, const char *desc, ...) \
 { \
-	va_list al; \
+	va_list args; \
 	struct buffer_data read_data, write_data; \
 	struct varbuf v = VARBUF_INIT; \
 	off_t ret; \
@@ -170,9 +170,9 @@ buffer_copy_##name(type1 n1, int typeIn, \
 	write_data.arg.name2 = n2; \
 	write_data.type = typeOut; \
 \
-	va_start(al, desc); \
-	varbufvprintf(&v, desc, al); \
-	va_end(al); \
+	va_start(args, desc); \
+	varbufvprintf(&v, desc, args); \
+	va_end(args); \
 \
 	buffer_init(&read_data, &write_data); \
 	ret = buffer_copy(&read_data, &write_data, limit, v.buf); \

lib/dpkg/command.c

@@ -129,20 +129,20 @@ command_add_argl(struct command *cmd, const char **argv)
  * @param al The NULL terminated va_list of argument array to append to argv.
  */
 void
-command_add_argv(struct command *cmd, va_list al)
+command_add_argv(struct command *cmd, va_list args)
 {
-	va_list at;
+	va_list args_copy;
 	int i, add_argc = 0;
 
-	va_copy(at, al);
-	while (va_arg(at, const char *) != NULL)
+	va_copy(args_copy, args);
+	while (va_arg(args_copy, const char *) != NULL)
 		add_argc++;
-	va_end(at);
+	va_end(args_copy);
 
 	command_grow_argv(cmd, add_argc);
 
 	for (i = 0; i < add_argc; i++)
-		cmd->argv[cmd->argc++] = va_arg(al, const char *);
+		cmd->argv[cmd->argc++] = va_arg(args, const char *);
 
 	cmd->argv[cmd->argc] = NULL;
 }
@@ -156,11 +156,11 @@ command_add_argv(struct command *cmd, va_list al)
 void
 command_add_args(struct command *cmd, ...)
 {
-	va_list al;
+	va_list args;
 
-	va_start(al, cmd);
-	command_add_argv(cmd, al);
-	va_end(al);
+	va_start(args, cmd);
+	command_add_argv(cmd, args);
+	va_end(args);
 }
 
 /**

lib/dpkg/command.h

@@ -43,7 +43,7 @@ void command_destroy(struct command *cmd);
 
 void command_add_arg(struct command *cmd, const char *arg);
 void command_add_argl(struct command *cmd, const char **argv);
-void command_add_argv(struct command *cmd, va_list al);
+void command_add_argv(struct command *cmd, va_list args);
 void command_add_args(struct command *cmd, ...) DPKG_ATTR_SENTINEL;
 
 void command_exec(struct command *cmd) DPKG_ATTR_NORET;

lib/dpkg/compress.c

@@ -45,7 +45,7 @@
 static void DPKG_ATTR_NORET DPKG_ATTR_SENTINEL
 fd_fd_filter(int fd_in, int fd_out, const char *desc, const char *file, ...)
 {
-	va_list al;
+	va_list args;
 	struct command cmd;
 
 	if (fd_in != 0) {
@@ -59,9 +59,9 @@ fd_fd_filter(int fd_in, int fd_out, const char *desc, const char *file, ...)
 
 	command_init(&cmd, file, desc);
 	command_add_arg(&cmd, file);
-	va_start(al, file);
-	command_add_argv(&cmd, al);
-	va_end(al);
+	va_start(args, file);
+	command_add_argv(&cmd, args);
+	va_end(args);
 
 	command_exec(&cmd);
 }
@@ -415,15 +415,15 @@ void
 decompress_filter(struct compressor *compressor, int fd_in, int fd_out,
                   const char *desc_fmt, ...)
 {
-	va_list al;
+	va_list args;
 	struct varbuf desc = VARBUF_INIT;
 
 	if (compressor == NULL)
 		internerr("no compressor specified");
 
-	va_start(al, desc_fmt);
-	varbufvprintf(&desc, desc_fmt, al);
-	va_end(al);
+	va_start(args, desc_fmt);
+	varbufvprintf(&desc, desc_fmt, args);
+	va_end(args);
 
 	compressor->decompress(fd_in, fd_out, desc.buf);
 
@@ -434,15 +434,15 @@ void
 compress_filter(struct compressor *compressor, int fd_in, int fd_out,
                 int compress_level, const char *desc_fmt, ...)
 {
-	va_list al;
+	va_list args;
 	struct varbuf desc = VARBUF_INIT;
 
 	if (compressor == NULL)
 		internerr("no compressor specified");
 
-	va_start(al, desc_fmt);
-	varbufvprintf(&desc, desc_fmt, al);
-	va_end(al);
+	va_start(args, desc_fmt);
+	varbufvprintf(&desc, desc_fmt, args);
+	va_end(args);
 
 	if (compress_level < 0)
 		compress_level = compressor->default_level;

lib/dpkg/dpkg.h

@@ -145,7 +145,8 @@ void do_internerr(const char *file, int line, const char *fmt, ...)
 #define internerr(...) do_internerr(__FILE__, __LINE__, __VA_ARGS__)
 
 void ohshit(const char *fmt, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1);
-void ohshitv(const char *fmt, va_list al) DPKG_ATTR_NORET DPKG_ATTR_VPRINTF(1);
+void ohshitv(const char *fmt, va_list args)
+	DPKG_ATTR_NORET DPKG_ATTR_VPRINTF(1);
 void ohshite(const char *fmt, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1);
 void werr(const char *what) DPKG_ATTR_NORET;
 void warning(const char *fmt, ...) DPKG_ATTR_PRINTF(1);

lib/dpkg/ehandle.c

@@ -199,9 +199,9 @@ void push_cleanup(void (*call1)(int argc, void **argv), int mask1,
                   void (*call2)(int argc, void **argv), int mask2,
                   unsigned int nargs, ...) {
   struct cleanupentry *cep;
-  void **args;
+  void **argv;
   int e;
-  va_list al;
+  va_list args;
 
   onerr_abort++;
   
@@ -214,10 +214,12 @@ void push_cleanup(void (*call1)(int argc, void **argv), int mask1,
   cep->calls[0].call= call1; cep->calls[0].mask= mask1;
   cep->calls[1].call= call2; cep->calls[1].mask= mask2;
   cep->cpmask=~0; cep->cpvalue=0; cep->argc= nargs;
-  va_start(al,nargs);
-  args= cep->argv; while (nargs-- >0) *args++= va_arg(al,void*);
-  *args++= NULL;
-  va_end(al);
+  va_start(args, nargs);
+  argv = cep->argv;
+  while (nargs-- > 0)
+    *argv++ = va_arg(args, void *);
+  *argv++ = NULL;
+  va_end(args);
   cep->next= econtext->cleanups;
   econtext->cleanups= cep;
   if (cep == &emergency.ce) { e= errno; ohshite(_("out of memory for new cleanup entry")); }
@@ -239,10 +241,11 @@ void pop_cleanup(int flagset) {
 }
 
 void ohshit(const char *fmt, ...) {
-  va_list al;
-  va_start(al,fmt);
-  vsnprintf(errmsgbuf,sizeof(errmsgbuf),fmt,al);
-  va_end(al);
+  va_list args;
+
+  va_start(args, fmt);
+  vsnprintf(errmsgbuf, sizeof(errmsgbuf), fmt, args);
+  va_end(args);
   errmsg= errmsgbuf;
 
   run_error_handler();
@@ -252,8 +255,10 @@ void print_error_fatal(const char *emsg, const char *contextstring) {
   fprintf(stderr, "%s: %s\n",thisname,emsg);
 }
 
-void ohshitv(const char *fmt, va_list al) {
-  vsnprintf(errmsgbuf,sizeof(errmsgbuf),fmt,al);
+void
+ohshitv(const char *fmt, va_list args)
+{
+  vsnprintf(errmsgbuf, sizeof(errmsgbuf), fmt, args);
   errmsg= errmsgbuf;
 
   run_error_handler();
@@ -261,13 +266,13 @@ void ohshitv(const char *fmt, va_list al) {
 
 void ohshite(const char *fmt, ...) {
   int e;
-  va_list al;
+  va_list args;
   char buf[1024];
 
   e=errno;
-  va_start(al,fmt);
-  vsnprintf(buf,sizeof(buf),fmt,al);
-  va_end(al);
+  va_start(args, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, args);
+  va_end(args);
 
   snprintf(errmsgbuf,sizeof(errmsgbuf),"%s: %s",buf,strerror(e));
   errmsg= errmsgbuf; 
@@ -278,12 +283,12 @@ void ohshite(const char *fmt, ...) {
 void
 warning(const char *fmt, ...)
 {
-  va_list al;
+  va_list args;
   char buf[1024];
 
-  va_start(al,fmt);
-  vsnprintf(buf,sizeof(buf),fmt,al);
-  va_end(al);
+  va_start(args, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, args);
+  va_end(args);
 
   fprintf(stderr, _("%s: warning: %s\n"), thisname, buf);
 }
@@ -295,12 +300,12 @@ void werr(const char *fn) {
 void
 do_internerr(const char *file, int line, const char *fmt, ...)
 {
-  va_list al;
+  va_list args;
   char buf[1024];
 
-  va_start(al, fmt);
-  vsnprintf(buf, sizeof(buf), fmt, al);
-  va_end(al);
+  va_start(args, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, args);
+  va_end(args);
 
   fprintf(stderr, _("%s:%s:%d: internal error: %s\n"),
           thisname, file, line, buf);

lib/dpkg/log.c

@@ -41,7 +41,7 @@ log_message(const char *fmt, ...)
 	static FILE *logfd = NULL;
 	char time_str[20];
 	time_t now;
-	va_list al;
+	va_list args;
 
 	if (!log_file)
 		return;
@@ -58,11 +58,11 @@ log_message(const char *fmt, ...)
 		setcloexec(fileno(logfd), log_file);
 	}
 
-	va_start(al, fmt);
+	va_start(args, fmt);
 	varbufreset(&log);
-	varbufvprintf(&log, fmt, al);
+	varbufvprintf(&log, fmt, args);
 	varbufaddc(&log, 0);
-	va_end(al);
+	va_end(args);
 
 	time(&now);
 	strftime(time_str, sizeof(time_str), "%Y-%m-%d %H:%M:%S",
@@ -79,19 +79,19 @@ statusfd_send(const char *fmt, ...)
 	struct pipef *pipef;
 	const char *p;
 	int r, l;
-	va_list al;
+	va_list args;
 
 	if (!status_pipes)
 		return;
 
-	va_start(al, fmt);
+	va_start(args, fmt);
 	varbufreset(&vb);
-	varbufvprintf(&vb, fmt, al);
+	varbufvprintf(&vb, fmt, args);
 	/* Sanitize string to not include new lines, as front-ends should be
 	 * doing their own word-wrapping. */
 	varbufsubstc(&vb, '\n', ' ');
 	varbufaddc(&vb, '\n');
-	va_end(al);
+	va_end(args);
 
 	for (pipef = status_pipes; pipef; pipef = pipef->next) {
 		for (p = vb.buf, l = vb.used; l;  p += r, l -= r) {

lib/dpkg/myopt.c

@@ -39,11 +39,11 @@ void
 badusage(const char *fmt, ...)
 {
   char buf[1024];
-  va_list al;
+  va_list args;
 
-  va_start(al, fmt);
-  vsnprintf(buf, sizeof(buf), fmt, al);
-  va_end(al);
+  va_start(args, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, args);
+  va_end(args);
 
   ohshit("%s\n\n%s", buf, gettext(printforhelp));
 }
@@ -52,11 +52,11 @@ static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(3)
 config_error(const char *file_name, int line_num, const char *fmt, ...)
 {
   char buf[1024];
-  va_list al;
+  va_list args;
 
-  va_start(al, fmt);
-  vsnprintf(buf, sizeof(buf), fmt, al);
-  va_end(al);
+  va_start(args, fmt);
+  vsnprintf(buf, sizeof(buf), fmt, args);
+  va_end(args);
 
   ohshit(_("configuration error: %s:%d: %s"), file_name, line_num, buf);
 }

lib/dpkg/parsehelp.c

@@ -48,36 +48,36 @@ void
 parse_error(struct parsedb_state *ps,
             const struct pkginfo *pigp, const char *fmt, ...)
 {
-  va_list al;
+  va_list args;
   char buf1[768], buf2[1000], *q;
 
   parse_error_msg(ps, pigp, _("parse error"), buf1);
   q = str_escape_fmt(buf2, buf1);
   strcat(q,fmt);
 
-  va_start(al,fmt);
-  ohshitv(buf2, al);
+  va_start(args, fmt);
+  ohshitv(buf2, args);
 }
 
 void
 parse_warn(struct parsedb_state *ps,
            const struct pkginfo *pigp, const char *fmt, ...)
 {
-  va_list al;
+  va_list args;
   char buf1[768], buf2[1000], *q;
 
   parse_error_msg(ps, pigp, _("warning"), buf1);
   q = str_escape_fmt(buf2, buf1);
   strcat(q, fmt);
 
-  va_start(al, fmt);
+  va_start(args, fmt);
   ps->warncount++;
   if (ps->warnto) {
     strcat(q,"\n");
-    if (vfprintf(ps->warnto, buf2, al) == EOF)
+    if (vfprintf(ps->warnto, buf2, args) == EOF)
       ohshite(_("failed to write parsing warning"));
   }
-  va_end(al);
+  va_end(args);
 }
 
 #define NAMEVALUE_DEF(n, v) \

lib/dpkg/varbuf.c

@@ -57,31 +57,33 @@ varbufsubstc(struct varbuf *v, int c_src, int c_dst)
 
 int varbufprintf(struct varbuf *v, const char *fmt, ...) {
   int r;
-  va_list al;
+  va_list args;
 
-  va_start(al, fmt);
-  r = varbufvprintf(v, fmt, al);
-  va_end(al);
+  va_start(args, fmt);
+  r = varbufvprintf(v, fmt, args);
+  va_end(args);
 
   return r;
 }
 
-int varbufvprintf(struct varbuf *v, const char *fmt, va_list va) {
-  va_list al;
+int
+varbufvprintf(struct varbuf *v, const char *fmt, va_list args)
+{
+  va_list args_copy;
   int needed, r;
 
-  va_copy(al, va);
-  needed = vsnprintf(NULL, 0, fmt, al);
-  va_end(al);
+  va_copy(args_copy, args);
+  needed = vsnprintf(NULL, 0, fmt, args_copy);
+  va_end(args_copy);
 
   if (needed < 0)
     ohshite(_("error formatting string into varbuf variable"));
 
   varbuf_grow(v, needed + 1);
 
-  va_copy(al, va);
-  r = vsnprintf(v->buf + v->used, needed + 1, fmt, al);
-  va_end(al);
+  va_copy(args_copy, args);
+  r = vsnprintf(v->buf + v->used, needed + 1, fmt, args_copy);
+  va_end(args_copy);
 
   if (r < 0)
     ohshite(_("error formatting string into varbuf variable"));

m4/dpkg-funcs.m4

@@ -35,11 +35,11 @@ AC_DEFUN([DPKG_FUNC_C99_SNPRINTF],
 int test_vsnprintf(const char *fmt, ...)
 {
 	int n;
-	va_list ap;
+	va_list args;
 
-	va_start(ap, fmt);
-	n = vsnprintf(NULL, 0, fmt, ap);
-	va_end(ap);
+	va_start(args, fmt);
+	n = vsnprintf(NULL, 0, fmt, args);
+	va_end(args);
 
 	return n;
 }

src/errors.c

@@ -108,15 +108,16 @@ skip_due_to_hold(struct pkginfo *pkg)
 }
 
 void forcibleerr(int forceflag, const char *fmt, ...) {
-  va_list al;
-  va_start(al,fmt);
+  va_list args;
+
+  va_start(args, fmt);
   if (forceflag) {
     warning(_("overriding problem because --force enabled:"));
     fputc(' ', stderr);
-    vfprintf(stderr,fmt,al);
+    vfprintf(stderr, fmt, args);
     fputc('\n',stderr);
   } else {
-    ohshitv(fmt,al);
+    ohshitv(fmt, args);
   }
-  va_end(al);
+  va_end(args);
 }

src/help.c

@@ -279,7 +279,7 @@ do_script(struct pkginfo *pkg, struct pkginfoperfile *pif,
 
 static int
 vmaintainer_script_installed(struct pkginfo *pkg, const char *scriptname,
-                             const char *desc, va_list ap)
+                             const char *desc, va_list args)
 {
   struct command cmd;
   const char *scriptpath;
@@ -291,7 +291,7 @@ vmaintainer_script_installed(struct pkginfo *pkg, const char *scriptname,
 
   command_init(&cmd, scriptpath, buf);
   command_add_arg(&cmd, scriptname);
-  command_add_argv(&cmd, ap);
+  command_add_argv(&cmd, args);
 
   if (stat(scriptpath,&stab)) {
     command_destroy(&cmd);
@@ -315,11 +315,11 @@ maintainer_script_installed(struct pkginfo *pkg, const char *scriptname,
                             const char *desc, ...)
 {
   int r;
-  va_list ap;
+  va_list args;
 
-  va_start(ap, desc);
-  r = vmaintainer_script_installed(pkg, scriptname, desc, ap);
-  va_end(ap);
+  va_start(args, desc);
+  r = vmaintainer_script_installed(pkg, scriptname, desc, args);
+  va_end(args);
   if (r)
     post_script_tasks();
 
@@ -330,11 +330,11 @@ int
 maintainer_script_postinst(struct pkginfo *pkg, ...)
 {
   int r;
-  va_list ap;
+  va_list args;
 
-  va_start(ap, pkg);
-  r = vmaintainer_script_installed(pkg, POSTINSTFILE, "post-installation", ap);
-  va_end(ap);
+  va_start(args, pkg);
+  r = vmaintainer_script_installed(pkg, POSTINSTFILE, "post-installation", args);
+  va_end(args);
   if (r)
     ensure_diversions();
 
@@ -348,17 +348,17 @@ maintainer_script_new(struct pkginfo *pkg,
 {
   struct command cmd;
   struct stat stab;
-  va_list ap;
+  va_list args;
   char buf[100];
   
   strcpy(cidirrest, scriptname);
   sprintf(buf, _("new %s script"), desc);
 
-  va_start(ap,cidirrest);
+  va_start(args, cidirrest);
   command_init(&cmd, cidir, buf);
   command_add_arg(&cmd, scriptname);
-  command_add_argv(&cmd, ap);
-  va_end(ap);
+  command_add_argv(&cmd, args);
+  va_end(args);
 
   if (stat(cidir,&stab)) {
     command_destroy(&cmd);
@@ -451,12 +451,13 @@ void clear_istobes(void) {
 }
 
 void debug(int which, const char *fmt, ...) {
-  va_list ap;
+  va_list args;
+
   if (!(f_debug & which)) return;
   fprintf(stderr,"D0%05o: ",which);
-  va_start(ap,fmt);
-  vfprintf(stderr,fmt,ap);
-  va_end(ap);
+  va_start(args, fmt);
+  vfprintf(stderr, fmt, args);
+  va_end(args);
   putc('\n',stderr);
 }