Previous fix 9e4e07c1811edbaf3376ad6e238a1353b405002b resulted in the inability to...

[netatalk.git] / bin / nbp / nbpunrgstr.c

diff --git a/bin/nbp/nbpunrgstr.c b/bin/nbp/nbpunrgstr.c
index aa69ae3b66f41ac656a1053e9c4f2c23492df996..a4a946530f21e7fe9de6d06e1aeccddbdc631d60 100644 (file)
--- a/bin/nbp/nbpunrgstr.c
+++ b/bin/nbp/nbpunrgstr.c
@@ -1,5 +1,5 @@
 /*
- * $Id: nbpunrgstr.c,v 1.6 2005-04-28 20:49:20 bfernhomberg Exp $
+ * $Id: nbpunrgstr.c,v 1.10 2009-10-29 11:35:58 didg Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -41,12 +41,11 @@
 
 #include <atalk/unicode.h>
 
-void Usage( av0 )
-    char       *av0;
+static void Usage(char *av0)
 {
     char       *p;
 
-    if (( p = strrchr( av0, '/' )) == 0 ) {
+    if (( p = strrchr( av0, '/' )) == NULL ) {
        p = av0;
     } else {
        p++;
@@ -56,12 +55,10 @@ void Usage( av0 )
     exit( 1 );
 }
 
-int main( ac, av )
-    int                ac;
-    char       **av;
+int main(int ac, char **av)
 {
-    char               *Obj = 0, *Type = 0, *Zone = 0;
-    char               *convname = 0;
+    char               *Obj = NULL, *Type = NULL, *Zone = NULL;
+    char               *convname = NULL;
     struct at_addr      addr;
     int                 c;
     charset_t          chMac = CH_MAC;
@@ -97,7 +94,7 @@ int main( ac, av )
 
     /* Convert the name */
     if ((size_t)(-1) == convert_string_allocate(CH_UNIX, chMac, 
-                        av[optind], strlen(av[optind]), &convname))
+                        av[optind], -1, &convname))
         convname = av[optind]; 
 
     /*