svn commit: samba r12579 - in branches/SAMBA_3_0: . examples/libsmbclient source/libsmb

[derrell at samba.org]

Author: derrell
Date: 2005-12-29 17:03:39 +0000 (Thu, 29 Dec 2005)
New Revision: 12579

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12579

Log:
 r12122 at cabra:  derrell | 2005-12-29 12:03:00 -0500
 allow for arbitrary option value types

Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/examples/libsmbclient/testbrowse.c
   branches/SAMBA_3_0/source/libsmb/libsmbclient.c


Changeset:

Property changes on: branches/SAMBA_3_0
___________________________________________________________________
Name: svk:merge
   - 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba3:12115
   + 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba3:12122

Modified: branches/SAMBA_3_0/examples/libsmbclient/testbrowse.c
===================================================================
--- branches/SAMBA_3_0/examples/libsmbclient/testbrowse.c	2005-12-29 17:03:17 UTC (rev 12578)
+++ branches/SAMBA_3_0/examples/libsmbclient/testbrowse.c	2005-12-29 17:03:39 UTC (rev 12579)
@@ -89,7 +89,7 @@
     /* If we've been asked to log to stderr instead of stdout... */
     if (debug_stderr) {
         /* ... then set the option to do so */
-        smbc_option_set(context, "debug_stderr", NULL);
+        smbc_option_set(context, "debug_stderr");
     }
 	
     /* Initialize the context using the previously specified options */

Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-29 17:03:17 UTC (rev 12578)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-29 17:03:39 UTC (rev 12579)
@@ -5947,14 +5947,22 @@
 void
 smbc_option_set(SMBCCTX *context,
                 char *option_name,
-                void *option_value)
+                ...)
 {
+        va_list args;
+
+        va_start(args, option_name);
+
         if (strcmp(option_name, "debug_stderr") == 0) {
                 /*
                  * Log to standard error instead of standard output.
+                 *
+                 *  optional parameters: none (it can't be turned off once on)
                  */
                 context->internal->_debug_stderr = True;
         }
+
+        va_end(args);
 }