Changeset 396 for branches/client-1.5/src

Timestamp:

Jan 28, 2010, 6:52:33 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Remove deprecated LOGFILE token

Location:

branches/client-1.5/src

Files:

• ndpsmb.c (modified) (3 diffs)
• rc/rc.dlg (modified) (1 diff)
• rc/rc.h (modified) (1 diff)
• rc/rc.rc (modified) (4 diffs)

branches/client-1.5/src/ndpsmb.c

@@ -207 +207 @@
         {ND_PROP_STRING, 0, "MASTER", "WORKGROUP"},
         { ND_PROP_ULONG, 0, "MASTERTYPE", "1"},
-        {ND_PROP_STRING, 0, "LOGFILE", ""},
+//      {ND_PROP_STRING, 0, "LOGFILE", ""},
         { ND_PROP_ULONG, 0, "LOGLEVEL", "0"},
         { ND_PROP_ULONG, 0, "EASUPPORT", "1"},
@@ -388 +388 @@
 
         pRes->rootlevel = 0;
-        *pRes->logfile = 0;
+//      *pRes->logfile = 0;
         pRes->loglevel = 0;
         pRes->easupport = 1;
@@ -474 +474 @@
 
         t = 0, q = NULL;
-        rc = ph->fsphQueryStringProperty (properties, "LOGFILE", &q, &t);
+/*      rc = ph->fsphQueryStringProperty (properties, "LOGFILE", &q, &t);
         if (!rc && t && *q)
         {
                 StrNCpy(pRes->logfile, q, sizeof(pRes->logfile) - 1);
         }
-
+ */
         t = 0;
         rc = ph->fsphQueryUlongProperty (properties, "LOGLEVEL", &t);

branches/client-1.5/src/rc/rc.dlg

@@ -30 +30 @@
                         WS_VISIBLE
         ENTRYFIELD      "", ENT_MASTER, 147, 33, 90, 8, ES_MARGIN
-        LTEXT           "Logfile:", LBL_LOGFILE, 251, 124, 11, 10, DT_BOTTOM | 
-                        NOT WS_VISIBLE
-        ENTRYFIELD      "", ENT_LOGFILE, 254, 112, 7, 8, ES_MARGIN | NOT 
-                        WS_VISIBLE
-        LTEXT           "Loglevel:", LBL_LOGLEVEL, 251, 131, 13, 10, 
-                        DT_BOTTOM | NOT WS_VISIBLE
-        SPINBUTTON      CMB_LOGLEVEL, 252, 12, 8, 35, SPBS_NUMERICONLY | 
-                        SPBS_MASTER | SPBS_JUSTRIGHT | WS_GROUP | NOT 
-                        WS_VISIBLE
         LTEXT           "Supports EA", LBL_EASUPPORT, 195, 104, 52, 10, 
                         DT_WORDBREAK

branches/client-1.5/src/rc/rc.h

@@ -16 +16 @@
 #define CMB_MASTER                  1013
 #define LBL_PROP                    1016
-#define LBL_LOGFILE                 1017
-#define ENT_LOGFILE                 1018
-#define LBL_LOGLEVEL                1019
-#define CMB_LOGLEVEL                1020
 #define LBL_EASUPPORT               1021
 #define CHK_EASUPPORT               1022

branches/client-1.5/src/rc/rc.rc

@@ -34 +34 @@
    "Help for command line utility:\r\n"
    "\r\n"
-   "nd mount smbfs s:\\mountpoint ;workgroup=...;server=...;share=...;user=...;password=...;master=...;mastertype=...;memlen=...;logfile=...;loglevel=...;easupport=...\r\n"
+   "nd mount smbfs s:\\mountpoint ;workgroup=...;server=...;share=...;user=...;password=...;master=...;mastertype=...;easupport=...\r\n"
    "\r\n"
    "    workgroup - name of workgroup\r\n"
@@ -43 +43 @@
    "    master - name of master server or master workgroup\r\n"
    "    mastertype - 0 if 'master' is the name of master server, 1 if 'master' is the name of master workgroup\r\n"
-   "    logfile - file to log records from smbcd.exe. Used only if smbcd.exe is run by ndpsmb.dll plugin, not manually\r\n"
-   "    loglevel - level of logging (0-9) for smbcd.exe. Used only if smbcd.exe is run by ndpsmb.dll plugin, not manually\r\n"
    "    easupport - 0 to not support EA, 1 to support\r\n"
    "\r\n"
@@ -102 +100 @@
 RCDATA (DLG_ID + 7)
 {
-    ENT_LOGFILE, PARMTYPE_STRING, 1L, 256L, "logfile", "%s", ""
-}
-
-RCDATA (DLG_ID + 8)
-{
-    CMB_LOGLEVEL, PARMTYPE_INT, 0L, 9L, "loglevel", "%d", 0L, 
-    "0", 
-    "1",
-    "2",
-    "3",
-    "4",
-    "5",
-    "6",
-    "7",
-    "8",
-    "9"
-}
-
-RCDATA (DLG_ID + 9)
-{
     CHK_EASUPPORT, PARMTYPE_INT, 0L, 1L, "easupport", "%d", 1L, 
     "0", 
@@ -127 +105 @@
 }
     
-RCDATA (DLG_ID + 10)
+RCDATA (DLG_ID + 8)
 {
     ENT_SPASS, PARMTYPE_STRING, 1L, 255L, "spassword", "%s", ""
 }
 
-RCDATA (DLG_ID + 11)
+RCDATA (DLG_ID + 9)
 {
     1