diff options
| author | Gerald Carter <jerry@samba.org> | 2005-03-22 16:39:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:11 -0500 |
| commit | 73d1950c010777605b1294397002cc7aa011add0 (patch) | |
| tree | 0ce5688fd41b8c4a897c73ded62ab49e46fbf390 | |
| parent | d44a7379323cc44f49ac1f5e57ce1b8a9d6c3f31 (diff) | |
| download | samba-73d1950c010777605b1294397002cc7aa011add0.tar.gz samba-73d1950c010777605b1294397002cc7aa011add0.tar.bz2 samba-73d1950c010777605b1294397002cc7aa011add0.zip | |
r5956: more compile warngin fixes from the Mr. Mader
(This used to be commit f3f315b14d261fa56ab040db036a6f858ac06e65)
| -rw-r--r-- | source3/lib/util_str.c | 6 | ||||
| -rw-r--r-- | source3/libads/ldap.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 6ec43a963b..86015b355a 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -363,16 +363,16 @@ BOOL strisnormal(const char *s, int case_default) NOTE: oldc and newc must be 7 bit characters **/ -void string_replace(pstring s,char oldc,char newc) +void string_replace( pstring s, char oldc, char newc ) { - unsigned char *p; + char *p; /* this is quite a common operation, so we want it to be fast. We optimise for the ascii case, knowing that all our supported multi-byte character sets are ascii-compatible (ie. they match for the first 128 chars) */ - for (p = (unsigned char *)s; *p; p++) { + for (p = s; *p; p++) { if (*p & 0x80) /* mb string - slow path. */ break; if (*p == oldc) diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 13e6aa5a31..68103a701b 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -831,7 +831,7 @@ ADS_MODLIST ads_init_mods(TALLOC_CTX *ctx) need to reset it to NULL before doing ldap modify */ mods[ADS_MODLIST_ALLOC_SIZE] = (LDAPMod *) -1; - return mods; + return (ADS_MODLIST)mods; } @@ -868,7 +868,7 @@ static ADS_STATUS ads_modlist_add(TALLOC_CTX *ctx, ADS_MODLIST *mods, memset(&modlist[curmod], 0, ADS_MODLIST_ALLOC_SIZE*sizeof(LDAPMod *)); modlist[curmod+ADS_MODLIST_ALLOC_SIZE] = (LDAPMod *) -1; - *mods = modlist; + *mods = (ADS_MODLIST)modlist; } if (!(modlist[curmod] = TALLOC_ZERO_P(ctx, LDAPMod))) @@ -1006,7 +1006,7 @@ ADS_STATUS ads_gen_add(ADS_STRUCT *ads, const char *new_dn, ADS_MODLIST mods) /* make sure the end of the list is NULL */ mods[i] = NULL; - ret = ldap_add_s(ads->ld, utf8_dn, mods); + ret = ldap_add_s(ads->ld, utf8_dn, (LDAPMod**)mods); SAFE_FREE(utf8_dn); return ADS_ERROR(ret); } |