Move afp_util.c module from afpd to libatalk

The afp_util.c module contains AFP utility methods that are useful for
applications that link with libatalk beyond afpd, notably the testsuite

Author: rdmark

etc/afpd/afp_asp.c

@@ -20,6 +20,7 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 
+#include <atalk/afp_util.h>
 #include <atalk/atp.h>
 #include <atalk/asp.h>
 #include <atalk/compat.h>

etc/afpd/afp_dsi.c

@@ -29,6 +29,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include <atalk/afp_util.h>
 #include <atalk/compat.h>
 #include <atalk/dsi.h>
 #include <atalk/fce_api.h>

etc/afpd/meson.build

@@ -2,7 +2,6 @@ afpd_sources = [
     'afp_config.c',
     'afp_dsi.c',
     'afp_options.c',
-    'afp_util.c',
     'afprun.c',
     'appl.c',
     'auth.c',

include/atalk/afp_util.h

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 1990,1993 Regents of The University of Michigan.
+ * All Rights Reserved.  See COPYRIGHT.
+ */
+
+#ifndef AFPD_AFP_UTIL_H
+#define AFPD_AFP_UTIL_H 1
+
+/* afp_util.c */
+extern const char *AfpNum2name(int);
+extern const char *AfpErr2name(int err);
+
+#endif

include/atalk/directory.h

@@ -119,4 +119,7 @@ static inline int path_isadir(struct path *o_path)
 #endif
 }
 
+/* directory.c */
+extern struct dir rootParent;
+
 #endif /* ATALK_DIRECTORY_H */

include/atalk/globals.h

@@ -231,13 +231,6 @@ extern void afp_options_parse_cmdline(AFPObj *obj, int ac, char **av);
 extern int setmessage(const char *);
 extern void readmessage(AFPObj *);
 
-/* afp_util.c */
-extern const char *AfpNum2name(int);
-extern const char *AfpErr2name(int err);
-
-/* directory.c */
-extern struct dir rootParent;
-
 #ifndef NO_DDP
 extern void afp_over_asp(AFPObj *);
 #endif /* NO_DDP */

include/atalk/meson.build

@@ -3,6 +3,7 @@ headers = [
     'adouble.h',
     'aep.h',
     'afp.h',
+    'afp_util.h',
     'asp.h',
     'atp.h',
     'cnid.h',

etc/afpd/afp_util.c renamed to libatalk/util/afp_util.c

@@ -10,7 +10,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <atalk/afp.h>
-#include <atalk/globals.h>
+#include <atalk/afp_util.h>
 
 const char *AfpNum2name(int num)
 {
@@ -233,9 +233,10 @@ const char *AfpNum2name(int num)
 
     case AFP_SYNCFORK           :
         return "AFP_SYNCFORK";	      /* 79 */
-    }
 
-    return "not yet defined";
+    default:
+        return "not yet defined";
+    }
 }
 
 #define AFPERR2NAME(err) case err : return #err
@@ -293,7 +294,8 @@ const char *AfpErr2name(int err)
         AFPERR2NAME(AFPERR_PWDCHNG);
         AFPERR2NAME(AFPERR_PWDPOLCY);
         AFPERR2NAME(AFPERR_USRLOGIN);
-    }
 
-    return "not yet defined";
+    default:
+        return "not yet defined";
+    }
 }

libatalk/util/meson.build

@@ -1,4 +1,5 @@
 util_sources = [
+    'afp_util.c',
     'atalk_addr.c',
     'bprint.c',
     'cnid.c',

test/afpd/meson.build

@@ -5,7 +5,6 @@ test_sources = [
     meson.project_source_root() / 'etc/afpd/afp_config.c',
     meson.project_source_root() / 'etc/afpd/afp_dsi.c',
     meson.project_source_root() / 'etc/afpd/afp_options.c',
-    meson.project_source_root() / 'etc/afpd/afp_util.c',
     meson.project_source_root() / 'etc/afpd/afprun.c',
     meson.project_source_root() / 'etc/afpd/appl.c',
     meson.project_source_root() / 'etc/afpd/auth.c',