diff options
author | Christophe Grenier <[email protected]> | 2017-04-08 11:21:28 +0200 |
---|---|---|
committer | Christophe Grenier <[email protected]> | 2017-04-08 11:21:28 +0200 |
commit | b9980e498714e98e53688906ed3b876a1ad79ad1 (patch) | |
tree | 72aaf61157292c52d547be093f4668900115b4f1 /src/file_dss.c | |
parent | 821d1e698a15c29b3c20b4585c804e96ba317784 (diff) |
PhotoRec: use get_time_from_xxx() new functions
Diffstat (limited to 'src/file_dss.c')
-rw-r--r-- | src/file_dss.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/file_dss.c b/src/file_dss.c index aa4e45cc..8f6de2b4 100644 --- a/src/file_dss.c +++ b/src/file_dss.c @@ -58,11 +58,9 @@ const file_hint_t file_hint_dss= { Filesize is always a multiple of 512 */ - static int header_check_dss(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new) { - struct tm tm_time; - const unsigned char *date_asc=&buffer[0x26]; + const char *date_asc=(const char *)&buffer[0x26]; unsigned int i; for(i=0; i<24; i++) if(!isdigit(date_asc[i])) @@ -71,17 +69,7 @@ static int header_check_dss(const unsigned char *buffer, const unsigned int buff file_recovery_new->extension=file_hint_dss.extension; /* File should be big enough to hold the comments */ file_recovery_new->min_filesize=100+0x31E; - memset(&tm_time, 0, sizeof(tm_time)); - tm_time.tm_sec=(date_asc[10]-'0')*10+(date_asc[11]-'0'); /* seconds 0-59 */ - tm_time.tm_min=(date_asc[8]-'0')*10+(date_asc[9]-'0'); /* minutes 0-59 */ - tm_time.tm_hour=(date_asc[6]-'0')*10+(date_asc[7]-'0'); /* hours 0-23*/ - tm_time.tm_mday=(date_asc[4]-'0')*10+(date_asc[5]-'0'); /* day of the month 1-31 */ - tm_time.tm_mon=(date_asc[2]-'0')*10+(date_asc[3]-'0')-1; /* month 1-12 */ - tm_time.tm_year=(date_asc[0]-'0')*10+(date_asc[1]-'0'); /* year */ - if(tm_time.tm_year<80) - tm_time.tm_year+=100; /* year 2000 - 2079 */ - tm_time.tm_isdst = -1; /* unknown daylight saving time */ - file_recovery_new->time=mktime(&tm_time); + file_recovery_new->time=get_time_from_YYMMDDHHMMSS(date_asc); return 1; } |