svn commit: samba r5956 - in branches/SAMBA_3_0/source: lib libads
jerry at samba.org
jerry at samba.org
Tue Mar 22 16:39:10 GMT 2005
Author: jerry
Date: 2005-03-22 16:39:09 +0000 (Tue, 22 Mar 2005)
New Revision: 5956
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5956
Log:
more compile warngin fixes from the Mr. Mader
Modified:
branches/SAMBA_3_0/source/lib/util_str.c
branches/SAMBA_3_0/source/libads/ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/util_str.c
===================================================================
--- branches/SAMBA_3_0/source/lib/util_str.c 2005-03-22 16:35:15 UTC (rev 5955)
+++ branches/SAMBA_3_0/source/lib/util_str.c 2005-03-22 16:39:09 UTC (rev 5956)
@@ -363,16 +363,16 @@
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)
Modified: branches/SAMBA_3_0/source/libads/ldap.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ldap.c 2005-03-22 16:35:15 UTC (rev 5955)
+++ branches/SAMBA_3_0/source/libads/ldap.c 2005-03-22 16:39:09 UTC (rev 5956)
@@ -831,7 +831,7 @@
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 @@
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 @@
/* 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);
}
More information about the samba-cvs
mailing list