[GNUnet-SVN] r9145 - in gnunet/src: include util

[gnunet]

Author: grothoff
Date: 2009-10-10 14:12:08 -0600 (Sat, 10 Oct 2009)
New Revision: 9145

Modified:
   gnunet/src/include/winproc.h
   gnunet/src/util/win.cc
Log:
document params properly:


Modified: gnunet/src/include/winproc.h
===================================================================
--- gnunet/src/include/winproc.h        2009-10-10 19:27:40 UTC (rev 9144)
+++ gnunet/src/include/winproc.h        2009-10-10 20:12:08 UTC (rev 9145)
@@ -200,7 +200,7 @@
   BOOL DereferenceShortcut (char *pszShortcut);
   long QueryRegistry (HKEY hMainKey, char *pszKey, char *pszSubKey,
                       char *pszBuffer, long *pdLength);
-  int ListNICs (void (*callback) (const char *, int, void *), void *cls);
+  int ListNICs (void (*callback) (void *, const char *, int), void *cls);
   BOOL AddPathAccessRights (char *lpszFileName, char *lpszAccountName,
                             DWORD dwAccessMask);
   char *winErrorStr (const char *prefix, int dwErr);

Modified: gnunet/src/util/win.cc
===================================================================
--- gnunet/src/util/win.cc      2009-10-10 19:27:40 UTC (rev 9144)
+++ gnunet/src/util/win.cc      2009-10-10 20:12:08 UTC (rev 9145)
@@ -103,9 +103,11 @@
 /**
  * Lists all network interfaces in a combo box
  * Used by the basic GTK configurator
- * @param callback
+ *
+ * @param callback function to call for each NIC
+ * @param callback_cls closure for callback
  */
-  int ListNICs(void (*callback) (const char *, int, void *), void * cls)
+  int ListNICs(void (*callback) (void *, const char *, int), void * 
callback_cls)
 {
   PMIB_IFTABLE pTable;
   PMIB_IPADDRTABLE pAddrTable;
@@ -201,7 +203,9 @@
         if (pszIfName)
                free(pszIfName);
 
-        callback(szEntry, pAddrTable->table[dwIfIdx].dwIndex == dwExternalNIC, 
cls);
+        callback(callback_cls,
+                szEntry, 
+                pAddrTable->table[dwIfIdx].dwIndex == dwExternalNIC);
       }
     }
     GlobalFree(pAddrTable);
@@ -513,7 +517,7 @@
  * @brief Grant permission to a file
  * @param lpszFileName the name of the file or directory
  * @param lpszAccountName the user account
- * @param the desired access (e.g. GENERIC_ALL)
+ * @param dwAccessMask the desired access (e.g. GENERIC_ALL)
  * @return TRUE on success
  * @remark based on 
http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q102102&;
  */