X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Fadouble%2Fad_date.c;h=ab1e0a7f963c6374c51347df3d5be6094d415545;hb=6ba00099278ecf64c81aaa6211059f29dbb5efdf;hp=682a825253daa36cd4810a5c87130b33834e5eaa;hpb=84ac66addc1af59c276ec0bbe645e9ad1bc2e31d;p=netatalk.git diff --git a/libatalk/adouble/ad_date.c b/libatalk/adouble/ad_date.c index 682a8252..ab1e0a7f 100644 --- 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);