Fix all remaining warnings from gcc -Wall that can be fixed

[netatalk.git] / etc / afpd / catsearch.c

diff --git a/etc/afpd/catsearch.c b/etc/afpd/catsearch.c
index 73a8a94fc9c0e881178fee334dc722dbefaa43f1..6115a4e4c306f068509d9036a91859b5d6565e72 100644 (file)
--- a/etc/afpd/catsearch.c
+++ b/etc/afpd/catsearch.c
@@ -422,7 +422,8 @@ static int rslt_add ( struct vol *vol, struct path *path, char **buf, int ext)
 {
 
        char            *p = *buf;
-       int             ret, tbuf =0;
+       int             ret;
+       size_t          tbuf =0;
        u_int16_t       resultsize;
        int             isdir = S_ISDIR(path->st.st_mode); 
 
@@ -662,8 +663,8 @@ catsearch_end: /* Exiting catsearch: error condition */
 } /* catsearch() */
 
 /* -------------------------- */
-int catsearch_afp(AFPObj *obj _U_, char *ibuf, int ibuflen,
-                  char *rbuf, int *rbuflen, int ext)
+static int catsearch_afp(AFPObj *obj _U_, char *ibuf, size_t ibuflen,
+                  char *rbuf, size_t *rbuflen, int ext)
 {
     struct vol *vol;
     u_int16_t   vid;
@@ -735,8 +736,8 @@ int catsearch_afp(AFPObj *obj _U_, char *ibuf, int ibuflen,
     }
 
     /* Parse file specifications */
-    spec1 = ibuf;
-    spec2 = ibuf + spec_len + 2;
+    spec1 = (unsigned char*)ibuf;
+    spec2 = (unsigned char*)ibuf + spec_len + 2;
 
     spec1 += 2; 
     spec2 += 2; 
@@ -884,15 +885,15 @@ int catsearch_afp(AFPObj *obj _U_, char *ibuf, int ibuflen,
 } /* catsearch_afp */
 
 /* -------------------------- */
-int afp_catsearch (AFPObj *obj, char *ibuf, int ibuflen,
-                  char *rbuf, int *rbuflen)
+int afp_catsearch (AFPObj *obj, char *ibuf, size_t ibuflen,
+                  char *rbuf, size_t *rbuflen)
 {
        return catsearch_afp( obj, ibuf, ibuflen, rbuf, rbuflen, 0);
 }
 
 
-int afp_catsearch_ext (AFPObj *obj, char *ibuf, int ibuflen,
-                  char *rbuf, int *rbuflen)
+int afp_catsearch_ext (AFPObj *obj, char *ibuf, size_t ibuflen,
+                  char *rbuf, size_t *rbuflen)
 {
        return catsearch_afp( obj, ibuf, ibuflen, rbuf, rbuflen, 1);
 }