Merge remote branch 'sf/branch-allea' into branch-allea

[netatalk.git] / bin / megatron / nad.c

diff --git a/bin/megatron/nad.c b/bin/megatron/nad.c
index 2e105675de2d9473de2248045bb1292409cfee26..9d0b64bf5627612a6bfeb1502d0512b6b8d27f1a 100644 (file)
--- a/bin/megatron/nad.c
+++ b/bin/megatron/nad.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nad.c,v 1.16 2009-10-13 22:55:36 didg Exp $
+ * $Id: nad.c,v 1.18 2010-01-27 21:27:53 didg Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -16,9 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 
 #include <atalk/adouble.h>
 #include <atalk/util.h>
@@ -27,7 +25,7 @@
 #include "megatron.h"
 #include "nad.h"
 
-struct volinfo vol;
+static struct volinfo  vol;
 static char            hexdig[] = "0123456789abcdef";
 
 static char mtou_buf[MAXPATHLEN + 1], utom_buf[MAXPATHLEN + 1];
@@ -344,7 +342,7 @@ utompath_error:
     return(utompathcap( upath ));
 }
 
-char *mtoupathiconv(char *mpath)
+static char *mtoupathiconv(char *mpath)
 {
     char        *m, *u;
     size_t       inplen;
@@ -409,7 +407,7 @@ void select_charset( int options)
     int                        hexfork[ NUMFORKS ];
 #endif /* HEXOUTPUT */
 
-struct nad_file_data {
+static struct nad_file_data {
     char               macname[ MAXPATHLEN + 1 ];
     char               adpath[ 2 ][ MAXPATHLEN + 1];
     int                        offset[ NUMFORKS ];
@@ -689,11 +687,11 @@ int nad_header_write(struct FHeader *fh)
     return( 0 );
 }
 
-int                    forkeid[] = { ADEID_DFORK, ADEID_RFORK };
+static int             forkeid[] = { ADEID_DFORK, ADEID_RFORK };
 
-int nad_read(int fork, char *forkbuf, int bufc)
+ssize_t nad_read(int fork, char *forkbuf, size_t bufc)
 {
-    int                        cc = 0;
+    ssize_t            cc = 0;
 
 #if DEBUG
     fprintf( stderr, "Entering nad_read\n" );
@@ -713,11 +711,11 @@ int nad_read(int fork, char *forkbuf, int bufc)
     return( cc );
 }
 
-int nad_write(int fork, char *forkbuf, int bufc)
+ssize_t nad_write(int fork, char *forkbuf, size_t bufc)
 {
     char               *buf_ptr;
-    int                        writelen;
-    int                        cc = 0;
+    size_t             writelen;
+    ssize_t            cc = 0;
 
 #if DEBUG
     fprintf( stderr, "Entering nad_write\n" );