summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-02-01 07:25:53 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-02-01 07:25:53 +0000
commit3b2244526c7ae64f744539154681b9883daebc3f (patch)
treee97ff5a3fa541746a605d1f58862c65d16e999f5 /source3/lib
parent21554bfae25d556562b24bdc5966fa517602561a (diff)
downloadsamba-3b2244526c7ae64f744539154681b9883daebc3f.tar.gz
samba-3b2244526c7ae64f744539154681b9883daebc3f.tar.bz2
samba-3b2244526c7ae64f744539154681b9883daebc3f.zip
Merge of signed/unsigned fixes from HEAD.
(This used to be commit e9f56a157bd472914eebf64fde586104d8274717)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/bitmap.c2
-rw-r--r--source3/lib/charcnv.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/bitmap.c b/source3/lib/bitmap.c
index 26d21d085f..1023dd6541 100644
--- a/source3/lib/bitmap.c
+++ b/source3/lib/bitmap.c
@@ -129,7 +129,7 @@ wraparound
****************************************************************************/
int bitmap_find(struct bitmap *bm, unsigned ofs)
{
- int i, j;
+ unsigned int i, j;
if (ofs > bm->n) ofs = 0;
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 3428377d95..6dd3cd52d9 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -139,7 +139,7 @@ size_t convert_string(charset_t from, charset_t to,
i_len=srclen;
o_len=destlen;
retval = smb_iconv(descriptor, &inbuf, &i_len, &outbuf, &o_len);
- if(retval==-1) {
+ if(retval==(size_t)-1) {
const char *reason="unknown error";
switch(errno) {
case EINVAL:
@@ -214,7 +214,7 @@ convert:
retval = smb_iconv(descriptor,
&inbuf, &i_len,
&outbuf, &o_len);
- if(retval == -1) {
+ if(retval == (size_t)-1) {
const char *reason="unknown error";
switch(errno) {
case EINVAL: