navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-26 20:16:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor tm2jv to handle fractional seconds removing duplicated code (#3489)

Browse Source
This commit is contained in:
itchyny authored and GitHub committed 2026-03-01 06:18:14 +09:00
1 parent 750dbe723b
commit 601a37f452
2 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/builtin.c
+7 -11
View File
@@ -1417,13 +1417,13 @@ static jv f_stderr(jq_state *jq, jv input) {
return input; return input;
} }
static jv tm2jv(struct tm *tm) { static jv tm2jv(struct tm *tm, double fsecs) {
return JV_ARRAY(jv_number(tm->tm_year + 1900), return JV_ARRAY(jv_number(tm->tm_year + 1900),
jv_number(tm->tm_mon), jv_number(tm->tm_mon),
jv_number(tm->tm_mday), jv_number(tm->tm_mday),
jv_number(tm->tm_hour), jv_number(tm->tm_hour),
jv_number(tm->tm_min), jv_number(tm->tm_min),
jv_number(tm->tm_sec), jv_number(tm->tm_sec + (fsecs - floor(fsecs))),
jv_number(tm->tm_wday), jv_number(tm->tm_wday),
jv_number(tm->tm_yday)); jv_number(tm->tm_yday));
} }
@@ -1597,7 +1597,7 @@ static jv f_strptime(jq_state *jq, jv a, jv b) {
if (tm.tm_yday == 367 && tm.tm_mday != 0 && tm.tm_mon >= 0 && tm.tm_mon <= 11) if (tm.tm_yday == 367 && tm.tm_mday != 0 && tm.tm_mon >= 0 && tm.tm_mon <= 11)
set_tm_yday(&tm); set_tm_yday(&tm);
#endif #endif
jv r = tm2jv(&tm); jv r = tm2jv(&tm, 0);
if (*end != '\0') if (*end != '\0')
r = jv_array_append(r, jv_string(end)); r = jv_array_append(r, jv_string(end));
jv_free(a); // must come after `*end` because `end` is a pointer into `a`'s string jv_free(a); // must come after `*end` because `end` is a pointer into `a`'s string
@@ -1686,8 +1686,7 @@ static jv f_gmtime(jq_state *jq, jv a) {
tmp = gmtime_r(&secs, &tm); tmp = gmtime_r(&secs, &tm);
if (tmp == NULL) if (tmp == NULL)
return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime")); return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime"));
a = tm2jv(tmp); return tm2jv(tmp, fsecs);
return jv_array_set(a, 5, jv_number(jv_number_value(jv_array_get(jv_copy(a), 5)) + (fsecs - floor(fsecs))));
} }
#elif defined HAVE_GMTIME #elif defined HAVE_GMTIME
static jv f_gmtime(jq_state *jq, jv a) { static jv f_gmtime(jq_state *jq, jv a) {
@@ -1701,8 +1700,7 @@ static jv f_gmtime(jq_state *jq, jv a) {
tmp = gmtime(&secs); tmp = gmtime(&secs);
if (tmp == NULL) if (tmp == NULL)
return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime")); return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime"));
a = tm2jv(tmp); return tm2jv(tmp, fsecs);
return jv_array_set(a, 5, jv_number(jv_number_value(jv_array_get(jv_copy(a), 5)) + (fsecs - floor(fsecs))));
} }
#else #else
static jv f_gmtime(jq_state *jq, jv a) { static jv f_gmtime(jq_state *jq, jv a) {
@@ -1723,8 +1721,7 @@ static jv f_localtime(jq_state *jq, jv a) {
tmp = localtime_r(&secs, &tm); tmp = localtime_r(&secs, &tm);
if (tmp == NULL) if (tmp == NULL)
return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime")); return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime"));
a = tm2jv(tmp); return tm2jv(tmp, fsecs);
return jv_array_set(a, 5, jv_number(jv_number_value(jv_array_get(jv_copy(a), 5)) + (fsecs - floor(fsecs))));
} }
#elif defined HAVE_GMTIME #elif defined HAVE_GMTIME
static jv f_localtime(jq_state *jq, jv a) { static jv f_localtime(jq_state *jq, jv a) {
@@ -1738,8 +1735,7 @@ static jv f_localtime(jq_state *jq, jv a) {
tmp = localtime(&secs); tmp = localtime(&secs);
if (tmp == NULL) if (tmp == NULL)
return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime")); return jv_invalid_with_msg(jv_string("error converting number of seconds since epoch to datetime"));
a = tm2jv(tmp); return tm2jv(tmp, fsecs);
return jv_array_set(a, 5, jv_number(jv_number_value(jv_array_get(jv_copy(a), 5)) + (fsecs - floor(fsecs))));
} }
#else #else
static jv f_localtime(jq_state *jq, jv a) { static jv f_localtime(jq_state *jq, jv a) {
tests/jq.test
+4
View File
@@ -1834,6 +1834,10 @@ gmtime
1425599507 1425599507
[2015,2,5,23,51,47,4,63] [2015,2,5,23,51,47,4,63]
gmtime[5]
1425599507.25
47.25
# test invalid tm input # test invalid tm input
try strftime("%Y-%m-%dT%H:%M:%SZ") catch . try strftime("%Y-%m-%dT%H:%M:%SZ") catch .
["a",1,2,3,4,5,6,7] ["a",1,2,3,4,5,6,7]