Fix ad_open, ad_flush, ad_close, VFS stuff and volinfo for adouble:ea, also deactivat...

[netatalk.git] / libatalk / adouble / ad_date.c

diff --git a/libatalk/adouble/ad_date.c b/libatalk/adouble/ad_date.c
index 682a825253daa36cd4810a5c87130b33834e5eaa..ab1e0a7f963c6374c51347df3d5be6094d415545 100644 (file)
--- a/libatalk/adouble/ad_date.c
+++ b/libatalk/adouble/ad_date.c
@@ -14,25 +14,12 @@ int ad_setdate(struct adouble *ad,
     if (xlate)
         date = AD_DATE_FROM_UNIX(date);
 
-    if (ad->ad_version == AD_VERSION1) {
-
-        if (!ad_getentryoff(ad, ADEID_FILEI))
-            return -1;
-
-        if (dateoff > AD_DATE_BACKUP)
-            return -1;
-        memcpy(ad_entry(ad, ADEID_FILEI) + dateoff, &date, sizeof(date));
-
-    } else if (ad->ad_version == AD_VERSION2) {
-        if (!ad_getentryoff(ad, ADEID_FILEDATESI))
-            return -1;
-
-        if (dateoff > AD_DATE_ACCESS)
-            return -1;
-        memcpy(ad_entry(ad, ADEID_FILEDATESI) + dateoff, &date, sizeof(date));
+    if (!ad_getentryoff(ad, ADEID_FILEDATESI))
+        return -1;
 
-    } else
+    if (dateoff > AD_DATE_ACCESS)
         return -1;
+    memcpy(ad_entry(ad, ADEID_FILEDATESI) + dateoff, &date, sizeof(date));
 
     return 0;
 }
@@ -43,23 +30,12 @@ int ad_getdate(const struct adouble *ad,
     int xlate = (dateoff & AD_DATE_UNIX);
 
     dateoff &= AD_DATE_MASK;
-    if (ad->ad_version == AD_VERSION1) {
-        if (dateoff > AD_DATE_BACKUP)
-            return -1;
-        if (!ad_getentryoff(ad, ADEID_FILEI))
-            return -1;
-        memcpy(date, ad_entry(ad, ADEID_FILEI) + dateoff, sizeof(u_int32_t));
-
-    } else if (ad->ad_version == AD_VERSION2) {
-        if (!ad_getentryoff(ad, ADEID_FILEDATESI))
-            return -1;
-
-        if (dateoff > AD_DATE_ACCESS)
-            return -1;
-        memcpy(date, ad_entry(ad, ADEID_FILEDATESI) + dateoff, sizeof(u_int32_t));
+    if (!ad_getentryoff(ad, ADEID_FILEDATESI))
+        return -1;
 
-    } else
+    if (dateoff > AD_DATE_ACCESS)
         return -1;
+    memcpy(date, ad_entry(ad, ADEID_FILEDATESI) + dateoff, sizeof(u_int32_t));
 
     if (xlate)
         *date = AD_DATE_TO_UNIX(*date);