document params properly:

diff --git a/src/include/winproc.h b/src/include/winproc.h
index a4241814187202841a4c806f7ff94f2b26b7d405..c036ba965ed562c40e2c0044cc98291ed643742e 100644 (file)
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -200,7 +200,7 @@ extern "C"
   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);

diff --git a/src/util/win.cc b/src/util/win.cc
index 8a168d23832edcb947ea1b108c36e8453ac635d8..df5f686b36a4f20a6857d712312faed59802f86c 100644 (file)
--- a/src/util/win.cc
+++ b/src/util/win.cc
@@ -103,9 +103,11 @@ void EnumNICs(PMIB_IFTABLE *pIfTable, PMIB_IPADDRTABLE *pAddrTable)
 /**\r
  * Lists all network interfaces in a combo box\r
  * Used by the basic GTK configurator\r
- * @param callback\r
+ *\r
+ * @param callback function to call for each NIC\r
+ * @param callback_cls closure for callback\r
  */\r
-  int ListNICs(void (*callback) (const char *, int, void *), void * cls)\r
+  int ListNICs(void (*callback) (void *, const char *, int), void * callback_cls)\r
 {\r
   PMIB_IFTABLE pTable;\r
   PMIB_IPADDRTABLE pAddrTable;\r
@@ -201,7 +203,9 @@ void EnumNICs(PMIB_IFTABLE *pIfTable, PMIB_IPADDRTABLE *pAddrTable)
         if (pszIfName)\r
                free(pszIfName);\r
 \r
-        callback(szEntry, pAddrTable->table[dwIfIdx].dwIndex == dwExternalNIC, cls);\r
+        callback(callback_cls,\r
+                szEntry, \r
+                pAddrTable->table[dwIfIdx].dwIndex == dwExternalNIC);\r
       }\r
     }\r
     GlobalFree(pAddrTable);\r
@@ -513,7 +517,7 @@ int CreateServiceAccount(char *pszName, char *pszDesc)
  * @brief Grant permission to a file\r
  * @param lpszFileName the name of the file or directory\r
  * @param lpszAccountName the user account\r
- * @param the desired access (e.g. GENERIC_ALL)\r
+ * @param dwAccessMask the desired access (e.g. GENERIC_ALL)\r
  * @return TRUE on success\r
  * @remark based on http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q102102&\r
  */\r