summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>2003-05-09 04:59:36 +0000
committerRichard Sharpe <sharpe@samba.org>2003-05-09 04:59:36 +0000
commit40c924cb1e9620bdac594cd80c616e83af690eaf (patch)
tree9c51f5dfb4bd49a0cbdb9189e5c896d2a4e9c426
parent5418b7b5f03539242c7b2a28be77ff90601429d6 (diff)
downloadsamba-40c924cb1e9620bdac594cd80c616e83af690eaf.tar.gz
samba-40c924cb1e9620bdac594cd80c616e83af690eaf.tar.bz2
samba-40c924cb1e9620bdac594cd80c616e83af690eaf.zip
Fix some compiler warnings about const etc ...
(This used to be commit edc51dbc9ce319c612e2ff9434ca5a7521ba016f)
-rw-r--r--source3/utils/editreg.c7
-rw-r--r--source3/utils/profiles.c4
2 files changed, 5 insertions, 6 deletions
diff --git a/source3/utils/editreg.c b/source3/utils/editreg.c
index c45959799b..709c8d53cd 100644
--- a/source3/utils/editreg.c
+++ b/source3/utils/editreg.c
@@ -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);
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index 7c2d820c81..afaa83f638 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -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);