Changeset 395

Timestamp:

Jan 28, 2010, 6:25:35 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Remove deprecated MEMLEN token

Location:

branches/client-1.5/src

Files:

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

branches/client-1.5/src/Makefile.kmk

@@ -36 +36 @@
 ndpsmb_CFLAGS = -Zomf
 # YD -O2/O3 triggers stack variable alignment bug in gcc 4.3.2/4.4.0!
-ndpsmb_CFLAGS.release = -g -O1 -march=pentium -mtune=pentium4
+# ndpsmb_CFLAGS.release = -g -O1 -march=pentium -mtune=pentium4
 # SCS when building with gcc 3.3.5 use the below cflags
-# ndpsmb_CFLAGS.release = -s -O3 -march=pentium -mcpu=pentium3
+ndpsmb_CFLAGS.release = -s -O3 -march=pentium -mcpu=pentium3
 ndpsmb_CFLAGS.debug = -g -O0 -DDEBUG_PRINTF
 ndpsmb_LDFLAGS = -Zomf -Zno-fork -Zmap -Zbin-files

branches/client-1.5/src/ndpsmb.c

@@ -207 +207 @@
         {ND_PROP_STRING, 0, "MASTER", "WORKGROUP"},
         { ND_PROP_ULONG, 0, "MASTERTYPE", "1"},
-        { ND_PROP_ULONG, 0, "MEMLEN", "2"},
         {ND_PROP_STRING, 0, "LOGFILE", ""},
         { ND_PROP_ULONG, 0, "LOGLEVEL", "0"},

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

@@ -30 +30 @@
                         WS_VISIBLE
         ENTRYFIELD      "", ENT_MASTER, 147, 33, 90, 8, ES_MARGIN
-        LTEXT           "Memory buffer:", LBL_MEMLEN, 253, 135, 10, 10, 
-                        DT_BOTTOM | NOT WS_VISIBLE
-        CONTROL         "", CMB_MEMLEN, 251, 98, 13, 11, WC_COMBOBOX, 
-                        CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP
         LTEXT           "Logfile:", LBL_LOGFILE, 251, 124, 11, 10, DT_BOTTOM | 
                         NOT WS_VISIBLE

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

@@ -15 +15 @@
 #define ENT_MASTER                  1012
 #define CMB_MASTER                  1013
-#define LBL_MEMLEN                  1014
-#define CMB_MEMLEN                  1015
 #define LBL_PROP                    1016
 #define LBL_LOGFILE                 1017

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

@@ -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"
-   "    memlen - the size of shared memory buffer allocated for every NDFS connection in size of 64k blocks\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"
@@ -103 +102 @@
 RCDATA (DLG_ID + 7)
 {
-    CMB_MEMLEN, PARMTYPE_INT, 1L, 10L, "memlen", "%d", 2L, 
-    "64k", 
-    "128k", 
-    "192k", 
-    "256k", 
-    "320k", 
-    "384k", 
-    "448k", 
-    "512k", 
-    "576k", 
-    "640k"
+    ENT_LOGFILE, PARMTYPE_STRING, 1L, 256L, "logfile", "%s", ""
 }
 
 RCDATA (DLG_ID + 8)
-{
-    ENT_LOGFILE, PARMTYPE_STRING, 1L, 256L, "logfile", "%s", ""
-}
-
-RCDATA (DLG_ID + 9)
 {
     CMB_LOGLEVEL, PARMTYPE_INT, 0L, 9L, "loglevel", "%d", 0L, 
@@ -136 +120 @@
 }
 
-RCDATA (DLG_ID + 10)
+RCDATA (DLG_ID + 9)
 {
     CHK_EASUPPORT, PARMTYPE_INT, 0L, 1L, "easupport", "%d", 1L, 
@@ -143 +127 @@
 }
     
-RCDATA (DLG_ID + 11)
+RCDATA (DLG_ID + 10)
 {
     ENT_SPASS, PARMTYPE_STRING, 1L, 255L, "spassword", "%s", ""
 }
 
-RCDATA (DLG_ID + 12)
+RCDATA (DLG_ID + 11)
 {
     1