sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

r22373: move in_list() to util_strlist.c to remove the dependency

Browse Source 
from util.o to next_token() and strcasecmp_m()

with this the pidl tests link better on some hosts

metze
(This used to be commit 54bfc1dccc40883d602402865eff3cfae676e9af)
This commit is contained in:
Stefan Metzmacher 2007-04-19 14:21:56 +00:00 committed by Gerald (Jerry) Carter
parent 6bc249edbf
commit 3c5618fb1b
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source4/lib/util/util_str.c
View File

@ -25,7 +25,6 @@
#include "includes.h"
#include "libcli/raw/smb.h"
#include "pstring.h"
#include "lib/ldb/include/ldb.h"
#include "system/locale.h"
/**
@ -246,29 +245,6 @@ _PUBLIC_ void hex_encode(const unsigned char *buff_in, size_t len, char **out_he
slprintf(&hex_buffer[i*2], 3, "%02X", buff_in[i]);
}
/**
Check if a string is part of a list.
**/
_PUBLIC_ BOOL in_list(const char *s, const char *list, BOOL casesensitive)
{
pstring tok;
const char *p=list;
if (!list)
return(False);
while (next_token(&p,tok,LIST_SEP,sizeof(tok))) {
if (casesensitive) {
if (strcmp(tok,s) == 0)
return(True);
} else {
if (strcasecmp_m(tok,s) == 0)
return(True);
}
}
return(False);
}
/**
Set a string value, allocing the space for the string
**/

25
source4/lib/util/util_strlist.c
View File

@ -20,6 +20,8 @@
*/
#include "includes.h"
#include "pstring.h"
#include "system/locale.h"
/**
* @file
@ -298,3 +300,26 @@ _PUBLIC_ BOOL str_list_check_ci(const char **list, const char *s)
}
return False;
}
/**
Check if a string is part of a list.
**/
_PUBLIC_ BOOL in_list(const char *s, const char *list, BOOL casesensitive)
{
pstring tok;
const char *p=list;
if (!list)
return(False);
while (next_token(&p,tok,LIST_SEP,sizeof(tok))) {
if (casesensitive) {
if (strcmp(tok,s) == 0)
return(True);
} else {
if (strcasecmp_m(tok,s) == 0)
return(True);
}
}
return(False);
}