summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-12-07 12:43:10 -0800
committerJeremy Allison <jra@samba.org>2007-12-07 12:43:10 -0800
commitade51769d5f7291f912893e5f959b651223a68c1 (patch)
treeaaf09396ce5711bee5305125ffb5b1ccb34940f8 /source3/param
parentacf15ae730c95443681404c76b67ccfca0253d8b (diff)
downloadsamba-ade51769d5f7291f912893e5f959b651223a68c1.tar.gz
samba-ade51769d5f7291f912893e5f959b651223a68c1.tar.bz2
samba-ade51769d5f7291f912893e5f959b651223a68c1.zip
We don't need P_GSTRING or P_UGSTRING anymore.
Jeremy. (This used to be commit 78dc75600099b5b3b5a8ecffec747a227ff51d70)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c55
1 files changed, 0 insertions, 55 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 89b1299a5d..529f4bfb3b 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2999,15 +2999,9 @@ static void show_parameter(int parmIndex)
bool hadFlag;
bool hadSyn;
bool inverse;
-#if 0
- const char *type[] = { "P_BOOL", "P_BOOLREV", "P_CHAR", "P_INTEGER",
- "P_OCTAL", "P_LIST", "P_STRING", "P_USTRING", "P_GSTRING",
- "P_UGSTRING", "P_ENUM", "P_SEP"};
-#else
const char *type[] = { "P_BOOL", "P_BOOLREV", "P_CHAR", "P_INTEGER",
"P_OCTAL", "P_LIST", "P_STRING", "P_USTRING",
"P_ENUM", "P_SEP"};
-#endif
unsigned flags[] = { FLAG_BASIC, FLAG_SHARE, FLAG_PRINT, FLAG_GLOBAL,
FLAG_WIZARD, FLAG_ADVANCED, FLAG_DEVELOPER, FLAG_DEPRECATED,
FLAG_HIDE, FLAG_DOS_STRING};
@@ -4177,17 +4171,6 @@ bool lp_do_parameter(int snum, const char *pszParmName, const char *pszParmValue
strupper_m(*(char **)parm_ptr);
break;
-#if 0
- case P_GSTRING:
- pstrcpy((char *)parm_ptr, pszParmValue);
- break;
-
- case P_UGSTRING:
- pstrcpy((char *)parm_ptr, pszParmValue);
- strupper_m((char *)parm_ptr);
- break;
-#endif
-
case P_ENUM:
lp_set_enum_parm( &parm_table[parmnum], pszParmValue, (int*)parm_ptr );
break;
@@ -4268,15 +4251,6 @@ static void print_parameter(struct parm_struct *p, void *ptr, FILE * f)
}
break;
-#if 0
- case P_GSTRING:
- case P_UGSTRING:
- if ((char *)ptr) {
- fprintf(f, "%s", (char *)ptr);
- }
- break;
-#endif
-
case P_STRING:
case P_USTRING:
if (*(char **)ptr) {
@@ -4310,18 +4284,6 @@ static bool equal_parameter(parm_type type, void *ptr1, void *ptr2)
case P_LIST:
return str_list_compare(*(char ***)ptr1, *(char ***)ptr2);
-#if 0
- case P_GSTRING:
- case P_UGSTRING:
- {
- char *p1 = (char *)ptr1, *p2 = (char *)ptr2;
- if (p1 && !*p1)
- p1 = NULL;
- if (p2 && !*p2)
- p2 = NULL;
- return (p1 == p2 || strequal(p1, p2));
- }
-#endif
case P_STRING:
case P_USTRING:
{
@@ -4415,12 +4377,6 @@ static bool is_default(int i)
case P_USTRING:
return strequal(parm_table[i].def.svalue,
*(char **)parm_table[i].ptr);
-#if 0
- case P_GSTRING:
- case P_UGSTRING:
- return strequal(parm_table[i].def.svalue,
- (char *)parm_table[i].ptr);
-#endif
case P_BOOL:
case P_BOOLREV:
return parm_table[i].def.bvalue ==
@@ -4827,17 +4783,6 @@ static void lp_save_defaults(void)
parm_table[i].def.svalue = NULL;
}
break;
-#if 0
- case P_GSTRING:
- case P_UGSTRING:
- if (parm_table[i].ptr) {
- parm_table[i].def.svalue = SMB_STRDUP((char *)parm_table[i].ptr);
- } else {
- parm_table[i].def.svalue = NULL;
- }
- break;
-#endif
-
case P_BOOL:
case P_BOOLREV:
parm_table[i].def.bvalue =