r5956: more compile warngin fixes from the Mr. Mader

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index 6ec43a963b31fa5ae3492d0bf4c08f6625faa805..86015b355ae45db7d71248ac5271faa147d69148 100644 (file)
--- a/source/lib/util_str.c
+++ b/source/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/source/libads/ldap.c b/source/libads/ldap.c
index 13e6aa5a3188c75b6e4a0ed6ffd0dc6bccff13b7..68103a701b7fb68f39d43f1c2f178a35b689b2bc 100644 (file)
--- a/source/libads/ldap.c
+++ b/source/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);
 }