mirror of
https://github.com/samba-team/samba.git
synced 2025-01-22 22:04:08 +03:00
Fix some compiler warnings about const etc ...
(This used to be commit edc51dbc9ce319c612e2ff9434ca5a7521ba016f)
This commit is contained in:
parent
5418b7b5f0
commit
40c924cb1e
@ -1041,7 +1041,6 @@ void *str_to_val(int type, char *val, int *len)
|
||||
|
||||
default:
|
||||
return NULL;
|
||||
break;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
@ -1212,7 +1211,7 @@ int string_to_sid(DOM_SID **sid, char *sid_str)
|
||||
lstr = strchr(lstr + 1, '-');
|
||||
}
|
||||
|
||||
return 1;
|
||||
/*return 1; */ /* Not Reached ... */
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1380,7 +1379,7 @@ REG_KEY *nt_add_reg_key_list(REGF *regf, REG_KEY *key, char * name, int create)
|
||||
else { /* Create more space in the list ... */
|
||||
if (!(list = (KEY_LIST *)realloc(list, sizeof(KEY_LIST) +
|
||||
(list->max_keys + REG_KEY_LIST_SIZE - 1)
|
||||
* sizeof(REG_KEY *))));
|
||||
* sizeof(REG_KEY *))))
|
||||
goto error;
|
||||
|
||||
list->max_keys += REG_KEY_LIST_SIZE;
|
||||
@ -1586,7 +1585,7 @@ int data_to_ascii(unsigned char *datap, int len, int type, char *ascii, int asci
|
||||
if (verbose) fprintf(stderr, "Len: %d\n", len);
|
||||
/* FIXME. This has to be fixed. It has to be UNICODE */
|
||||
return uni_to_ascii(datap, ascii, len, ascii_max);
|
||||
break;
|
||||
break; /*NOTREACHED*/
|
||||
|
||||
case REG_TYPE_EXPANDSZ:
|
||||
return uni_to_ascii(datap, ascii, len, ascii_max);
|
||||
|
@ -418,10 +418,10 @@ static int my_sid_equal(DOM_SID *s1, DOM_SID *s2)
|
||||
* Quick and dirty to read a SID in S-1-5-21-x-y-z-rid format and
|
||||
* construct a DOM_SID
|
||||
*/
|
||||
static int get_sid(DOM_SID *sid, char *sid_str)
|
||||
static int get_sid(DOM_SID *sid, const unsigned char *sid_str)
|
||||
{
|
||||
int i = 0, auth;
|
||||
char *lstr;
|
||||
const unsigned char *lstr;
|
||||
|
||||
if (strncmp(sid_str, "S-1-5", 5)) {
|
||||
fprintf(stderr, "Does not conform to S-1-5...: %s\n", sid_str);
|
||||
|
Loading…
x
Reference in New Issue
Block a user