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 132c4f1ae7935b151b68ce34d269f3b91cd68616..ab1e0a7f963c6374c51347df3d5be6094d415545 100644 (file)
--- a/libatalk/adouble/ad_date.c
+++ b/libatalk/adouble/ad_date.c
@@ -5,63 +5,39 @@
 #include <string.h>
 #include <atalk/adouble.h>
 
-int ad_setdate(struct adouble *ad, 
-              unsigned int dateoff, u_int32_t date)
+int ad_setdate(struct adouble *ad,
+               unsigned int dateoff, u_int32_t date)
 {
-  int xlate = (dateoff & AD_DATE_UNIX);
+    int xlate = (dateoff & AD_DATE_UNIX);
 
-  dateoff &= AD_DATE_MASK;
-  if (xlate)
-    date = AD_DATE_FROM_UNIX(date);
+    dateoff &= AD_DATE_MASK;
+    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));
 
-  } else 
-    return -1;
-
-  return 0;
+    return 0;
 }
 
 int ad_getdate(const struct adouble *ad,
-              unsigned int dateoff, u_int32_t *date) 
+               unsigned int dateoff, u_int32_t *date)
 {
-  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));
+    int xlate = (dateoff & AD_DATE_UNIX);
 
-  } else if (ad->ad_version == AD_VERSION2) {
+    dateoff &= AD_DATE_MASK;
     if (!ad_getentryoff(ad, ADEID_FILEDATESI))
         return -1;
 
     if (dateoff > AD_DATE_ACCESS)
-      return -1;
+        return -1;
     memcpy(date, ad_entry(ad, ADEID_FILEDATESI) + dateoff, sizeof(u_int32_t));
 
-  } else 
-    return -1;
-
-  if (xlate)
-    *date = AD_DATE_TO_UNIX(*date);
-  return 0;
+    if (xlate)
+        *date = AD_DATE_TO_UNIX(*date);
+    return 0;
 }