diff --git a/aqvm/base/file/windows/file.h b/aqvm/base/file/windows/file.h index d9eeb30..8feb0b8 100644 --- a/aqvm/base/file/windows/file.h +++ b/aqvm/base/file/windows/file.h @@ -13,7 +13,5 @@ HANDLE AqvmBaseFileWindows_ConvertFileToHandle(struct AqvmBaseFile_File* file); -// fopen freopen setbuf tmpfile tmpnam vsprintf - #endif #endif \ No newline at end of file diff --git a/aqvm/base/process/file_lock/unix/file_lock.c b/aqvm/base/process/file_lock/unix/file_lock.c index f481cf7..1f11de8 100644 --- a/aqvm/base/process/file_lock/unix/file_lock.c +++ b/aqvm/base/process/file_lock/unix/file_lock.c @@ -33,7 +33,6 @@ int AqvmBaseProcessFileLockUnix_LockFile(struct AqvmBaseFile_File* file) { if (fcntl(fd, F_SETLK, &file_lock) == -1) { - printf("%i",errno); return -4; } return 0; diff --git a/aqvm/base/time/time.c b/aqvm/base/time/time.c index 7a451ea..df549cd 100644 --- a/aqvm/base/time/time.c +++ b/aqvm/base/time/time.c @@ -17,7 +17,7 @@ int AqvmBaseTime_localtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { - if (timestamp != (time_t)-1 || result == NULL) { + if (timestamp == (time_t)-1 || result == NULL) { // TODO return -1; } @@ -74,7 +74,7 @@ int AqvmBaseTime_localtime(const time_t timestamp, int AqvmBaseTime_gmtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { - if (timestamp != (time_t)-1 || result == NULL) { + if (timestamp == (time_t)-1 || result == NULL) { // TODO return -1; } @@ -109,7 +109,7 @@ bool AqvmBaseTime_IsValidTime(const struct AqvmBaseTime_Time* time_info) { // TODO return false; } - if (time_info->year < 1970 || time_info->year > 9999) { + if (time_info->year < 1900 || time_info->year > 9999) { // TODO return false; } @@ -189,7 +189,7 @@ int AqvmBaseTime_ConvertTmToTime(const struct tm* time_info, return -1; } - result->year = time_info->tm_year + 1970; + result->year = time_info->tm_year + 1900; result->month = time_info->tm_mon + 1; result->day = time_info->tm_mday; result->hour = time_info->tm_hour; @@ -212,7 +212,7 @@ int AqvmBaseTime_ConvertTimeToTm(const struct AqvmBaseTime_Time* time_info, return -1; } - result->tm_year = time_info->year - 1970; + result->tm_year = time_info->year - 1900; result->tm_mon = time_info->month - 1; result->tm_mday = time_info->day; result->tm_hour = time_info->hour; @@ -305,7 +305,7 @@ int AqvmBaseTime_SetIsdst(struct AqvmBaseTime_Time* time_info) { } time_t timestamp = AqvmBaseTime_mktime(time_info); - if (timestamp != (time_t)-1) { + if (timestamp == (time_t)-1) { // TODO return -2; } @@ -321,25 +321,19 @@ int AqvmBaseTime_SetIsdst(struct AqvmBaseTime_Time* time_info) { int AqvmBaseTime_SetTimeZoneOffset(struct AqvmBaseTime_Time* time_info) { if (!AqvmBaseTime_IsValidTime(time_info)) { // TODO - printf("invalid time\n"); return -1; } time_t timestamp = AqvmBaseTime_mktime(time_info); if (timestamp == (time_t)-1) { // TODO - printf("mktime error\n"); return -2; } struct AqvmBaseTime_Time local_time; - /*if (AqvmBaseTime_localtime(timestamp, &local_time) != 0) { + if (AqvmBaseTime_localtime(timestamp, &local_time) != 0) { // TODO - printf("localtime error\n"); return -3; - }*/ - printf("timestamp: %ld\n", timestamp); - printf("return %d\n", AqvmBaseTime_localtime(timestamp, &local_time)); - printf("errno: %d,message: %s\n", errno, strerror(errno)); + } time_info->offset_sign = local_time.offset_sign; time_info->offset_hour = local_time.offset_hour; time_info->offset_minute = local_time.offset_minute; diff --git a/aqvm/base/time/unix/time.c b/aqvm/base/time/unix/time.c index 68124b8..9bb5371 100644 --- a/aqvm/base/time/unix/time.c +++ b/aqvm/base/time/unix/time.c @@ -13,7 +13,7 @@ int AqvmBaseTimeUnix_localtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { - if (timestamp != (time_t)-1 || result == NULL) { + if (timestamp == (time_t)-1 || result == NULL) { // TODO return -1; } @@ -33,7 +33,7 @@ int AqvmBaseTimeUnix_localtime(const time_t timestamp, int AqvmBaseTimeUnix_gmtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { - if (timestamp != (time_t)-1 || result == NULL) { + if (timestamp == (time_t)-1 || result == NULL) { // TODO return -1; } diff --git a/aqvm/base/time/windows/time.c b/aqvm/base/time/windows/time.c index c972a7b..9d2eb48 100644 --- a/aqvm/base/time/windows/time.c +++ b/aqvm/base/time/windows/time.c @@ -14,7 +14,7 @@ int AqvmBaseTimeWindows_localtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { - if (timestamp != (time_t)-1 || result == NULL) { + if (timestamp == (time_t)-1 || result == NULL) { // TODO return -1; } @@ -34,7 +34,7 @@ int AqvmBaseTimeWindows_localtime(const time_t timestamp, int AqvmBaseTimeWindows_gmtime(const time_t timestamp, struct AqvmBaseTime_Time* result) { - if (timestamp != (time_t)-1 || result == NULL) { + if (timestamp == (time_t)-1 || result == NULL) { // TODO return -1; } @@ -90,22 +90,18 @@ int AqvmBaseTimeWindows_GetCurrentTime(struct AqvmBaseTime_Time* result) { if (AqvmBaseTime_SetWeekday(result) != 0) { // TODO - printf("SetWeekday error\n"); return -3; } if (AqvmBaseTime_SetYearday(result) != 0) { // TODO - printf("SetYearday error\n"); return -4; } if (AqvmBaseTime_SetTimeZoneOffset(result) != 0) { // TODO - printf("SetTimeZoneOffset error\n"); return -5; } if (AqvmBaseTime_SetIsdst(result) != 0) { // TODO - printf("SetIsdst error\n"); return -6; }