Rewrite ad_open arg order and style: require flags and mode to be specified for every...

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

diff --git a/etc/afpd/desktop.c b/etc/afpd/desktop.c
index fde6fef14245a363c9341a88862200b560bc6d0d..369b4aaa4ab7b8bc5d0ae11c71a7a12513726799 100644 (file)
--- a/etc/afpd/desktop.c
+++ b/etc/afpd/desktop.c
@@ -692,11 +692,10 @@ static int ad_addcomment(struct vol *vol, struct path *path, char *ibuf)
     } else
         adp = of->of_ad;
 
-    if (ad_open(upath,
+    if (ad_open(adp, upath,
                 ADFLAGS_HF | ( (isadir) ? ADFLAGS_DIR : 0),
                 O_CREAT | O_RDWR,
-                0666,
-                adp) < 0 ) {
+                0666) < 0 ) {
         return( AFPERR_ACCESS );
     }
 
@@ -847,7 +846,7 @@ static int ad_rmvcomment(struct vol *vol, struct path *path)
     } else
         adp = of->of_ad;
 
-    if ( ad_open_metadata( upath, (isadir) ? ADFLAGS_DIR : 0, 0, adp) < 0 ) {
+    if ( ad_open(adp, upath, ADFLAGS_HF | (isadir) ? ADFLAGS_DIR : 0, 0) < 0 ) {
         switch ( errno ) {
         case ENOENT :
             return( AFPERR_NOITEM );