Remove extra va_start/va_end calls (bug 17244)

git-mirror · Sep 16, 2015 · 1f60740 · 1f60740
1 parent a6d9312
commit 1f60740
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
 2015-09-16  Andreas Schwab  <schwab@suse.de>
 
+	[BZ #17244]
+	* sysdeps/unix/sysv/linux/semctl.c (__old_semctl, __new_semctl):
+	Remove extra va_start/va_end calls.
+
 	[BZ #17243]
 	* posix/execl.c (execl): Add missing va_end.
 	* posix/execle.c (execle): Likewise.

diff --git a/NEWS b/NEWS
@@ -10,11 +10,11 @@ Version 2.23
 * The following bugs are resolved with this release:
 
   2542, 2543, 2558, 2898, 14341, 14912, 15786, 15918, 16141, 16296, 16517,
-  16519, 16520, 16521, 16734, 16973, 16985, 17243, 17787, 17905, 18084,
-  18086, 18240, 18265, 18370, 18421, 18480, 18525, 18595, 18610, 18618,
-  18647, 18661, 18674, 18675, 18681, 18757, 18778, 18781, 18787, 18789,
-  18790, 18795, 18796, 18820, 18823, 18824, 18857, 18863, 18870, 18873,
-  18875, 18887, 18921, 18952, 18961, 18966, 18967.
+  16519, 16520, 16521, 16734, 16973, 16985, 17243, 17244, 17787, 17905,
+  18084, 18086, 18240, 18265, 18370, 18421, 18480, 18525, 18595, 18610,
+  18618, 18647, 18661, 18674, 18675, 18681, 18757, 18778, 18781, 18787,
+  18789, 18790, 18795, 18796, 18820, 18823, 18824, 18857, 18863, 18870,
+  18873, 18875, 18887, 18921, 18952, 18961, 18966, 18967.
 
 * The obsolete header <regexp.h> has been removed.  Programs that require
   this header must be updated to use <regex.h> instead.

diff --git a/sysdeps/unix/sysv/linux/semctl.c b/sysdeps/unix/sysv/linux/semctl.c
@@ -65,8 +65,6 @@ __old_semctl (int semid, int semnum, int cmd, ...)
   union semun arg;
   va_list ap;
 
-  va_start (ap, cmd);
-
   /* Get the argument only if required.  */
   arg.buf = NULL;
   switch (cmd)
@@ -85,8 +83,6 @@ __old_semctl (int semid, int semnum, int cmd, ...)
       break;
     }
 
-  va_end (ap);
-
   return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd,
 			 &arg);
 }
@@ -99,8 +95,6 @@ __new_semctl (int semid, int semnum, int cmd, ...)
   union semun arg;
   va_list ap;
 
-  va_start (ap, cmd);
-
   /* Get the argument only if required.  */
   arg.buf = NULL;
   switch (cmd)
@@ -119,8 +113,6 @@ __new_semctl (int semid, int semnum, int cmd, ...)
       break;
     }
 
-  va_end (ap);
-
   return INLINE_SYSCALL (ipc, 5, IPCOP_semctl, semid, semnum, cmd | __IPC_64,
 			 &arg);
 }