OSSP CVS Repository

ossp - Check-in [5013]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 5013
Date: 2005-Feb-03 11:40:14 (local)
2005-Feb-03 10:40:14 (UTC)
User:rse
Branch:
Comment: Revert recently made change "fix va_list variable passing in cfg_fmt functions" by using a double-cast which is evil but keeps the orrect semantics.
Tickets:
Inspections:
Files:
ossp-pkg/cfg/ChangeLog      1.33 -> 1.34     5 inserted, 0 deleted
ossp-pkg/cfg/cfg_fmt.c      1.9 -> 1.10     1 inserted, 1 deleted
ossp-pkg/cfg/cfg_fmt.h      1.7 -> 1.8     1 inserted, 1 deleted

ossp-pkg/cfg/ChangeLog 1.33 -> 1.34

--- ChangeLog    2005/02/03 10:32:08     1.33
+++ ChangeLog    2005/02/03 10:40:14     1.34
@@ -10,6 +10,11 @@
 
  Changes between 0.9.8 and 0.9.9 (24-Jan-2005 to xx-Feb-2005):
 
+   *) Revert recently made change "fix va_list variable passing in
+      cfg_fmt functions" by using a double-cast which is evil but keeps
+      the orrect semantics.
+      [Ralf S. Engelschall <rse@engelschall.com>]
+
    *) Plug a memory leak in cfg_fmt.c's cfg_fmt_vasprintf()
       in case a formatting error occurs.
       [Ralf S. Engelschall <rse@engelschall.com>]


ossp-pkg/cfg/cfg_fmt.c 1.9 -> 1.10

--- cfg_fmt.c    2005/02/03 10:32:08     1.9
+++ cfg_fmt.c    2005/02/03 10:40:14     1.10
@@ -1041,7 +1041,7 @@
                     if (vbuff->format != NULL) {
                         vbuff->format(vbuff,
                                       &prefix_char, &pad_char, &s, &s_len,
-                                      num_buf, NUM_BUF_SIZE, extinfo, *fmt, ap);
+                                      num_buf, NUM_BUF_SIZE, extinfo, *fmt, (va_list *)(void *)&ap);
                         if (s == NULL)
                             return -1;
                     }


ossp-pkg/cfg/cfg_fmt.h 1.7 -> 1.8

--- cfg_fmt.h    2005/01/24 14:18:48     1.7
+++ cfg_fmt.h    2005/02/03 10:40:14     1.8
@@ -52,7 +52,7 @@
         int num_buf_size,                /* input  arg: temporary buffer len */
         char *extinfo,                   /* input  arg: extension information */
         char fmt_char,                   /* input  arg: current formatting character */
-        va_list ap                       /* in/out arg: variable argument pointer */
+        va_list *ap                      /* in/out arg: variable argument pointer */
     );
 
     /* arbitrary passed-through application data */

CVSTrac 2.0.1