sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

Use str_list_equal() rather than str_list_compare().

Browse Source
This commit is contained in:
Jelmer Vernooij
2008-10-18 15:56:07 +02:00
parent 23c95c9119
commit 89c9545430
4 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/proto.h
View File

@ -1664,7 +1664,7 @@ char *binary_string(char *buf, int len);
int fstr_sprintf(fstring s, const char *fmt, ...); int fstr_sprintf(fstring s, const char *fmt, ...);
char **str_list_make(TALLOC_CTX *mem_ctx, const char *string, const char *sep); char **str_list_make(TALLOC_CTX *mem_ctx, const char *string, const char *sep);
char **str_list_copy(TALLOC_CTX *mem_ctx, const char **list); char **str_list_copy(TALLOC_CTX *mem_ctx, const char **list);
bool str_list_compare(char **list1, char **list2); bool str_list_equal(const char **list1, const char **list2);
size_t str_list_length( const char * const*list ); size_t str_list_length( const char * const*list );
bool str_list_sub_basic( char **list, const char *smb_name, bool str_list_sub_basic( char **list, const char *smb_name,
const char *domain_name ); const char *domain_name );

23
source3/lib/util_str.c
View File

@ -1843,29 +1843,6 @@ int fstr_sprintf(fstring s, const char *fmt, ...)
#define S_LIST_ABS 16 /* List Allocation Block Size */ #define S_LIST_ABS 16 /* List Allocation Block Size */
/**
* Return true if all the elements of the list match exactly.
**/
bool str_list_compare(char **list1, char **list2)
{
int num;
if (!list1 || !list2)
return (list1 == list2);
for (num = 0; list1[num]; num++) {
if (!list2[num])
return false;
if (!strcsequal(list1[num], list2[num]))
return false;
}
if (list2[num])
return false; /* if list2 has more elements than list1 fail */
return true;
}
/****************************************************************************** /******************************************************************************
version of standard_sub_basic() for string lists; uses talloc_sub_basic() version of standard_sub_basic() for string lists; uses talloc_sub_basic()
for the work for the work

6
source3/param/loadparm.c
View File

@ -7423,7 +7423,7 @@ static bool equal_parameter(parm_type type, void *ptr1, void *ptr2)
return (*((char *)ptr1) == *((char *)ptr2)); return (*((char *)ptr1) == *((char *)ptr2));
case P_LIST: case P_LIST:
return str_list_compare(*(char ***)ptr1, *(char ***)ptr2); return str_list_equal(*(const char ***)ptr1, *(const char ***)ptr2);
case P_STRING: case P_STRING:
case P_USTRING: case P_USTRING:
@ -7512,8 +7512,8 @@ static bool is_default(int i)
return False; return False;
switch (parm_table[i].type) { switch (parm_table[i].type) {
case P_LIST: case P_LIST:
return str_list_compare (parm_table[i].def.lvalue, return str_list_equal((const char **)parm_table[i].def.lvalue,
*(char ***)parm_table[i].ptr); *(const char ***)parm_table[i].ptr);
case P_STRING: case P_STRING:
case P_USTRING: case P_USTRING:
return strequal(parm_table[i].def.svalue, return strequal(parm_table[i].def.svalue,

3
source3/web/swat.c
View File

@ -384,7 +384,8 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte
break; break;
case P_LIST: case P_LIST:
if (!str_list_compare(*(char ***)ptr, (char **)(parm->def.lvalue))) continue; if (!str_list_equal(*(const char ***)ptr,
(const char **)(parm->def.lvalue))) continue;
break; break;
case P_STRING: case P_STRING: