config UPDATE remove obsolete option

Author: michalvasko

CMakeLists.txt

@@ -265,7 +265,6 @@ else()
     set(INTERNAL_DOCS NO)
 endif()
 
-option(ENABLE_DATE_AND_TIME_TYPE_COMPAT "Print ietf-yang-types 'date-and-time' values in an unknown timezone with '-00:00' instead of 'Z'" OFF)
 set(LYD_VALUE_SIZE "24" CACHE STRING "Maximum size in bytes of data node values that do not need to be allocated dynamically, minimum is 8")
 if(LYD_VALUE_SIZE LESS 8)
     message(FATAL_ERROR "Data node value size \"${LYD_VALUE_SIZE}\" is not valid.")

src/ly_config.h.in

@@ -78,9 +78,6 @@
 #  define LIBYANG_API_DECL
 #endif
 
-/** date-and-time canonical value with an unknown time zone printed in backwards-compatible way with -00:00 instead of Z */
-#cmakedefine ENABLE_DATE_AND_TIME_TYPE_COMPAT
-
 /** existence of regex.h */
 #cmakedefine HAVE_REGEX_H
 

src/plugins_types/date_and_time.c

@@ -120,11 +120,7 @@ lyplg_type_store_date_and_time(const struct ly_ctx *ctx, const struct lysc_type
         goto cleanup;
     }
 
-    if (!strncmp(((char *)value + value_size) - 6, "-00:00", 6)
-#ifndef ENABLE_DATE_AND_TIME_TYPE_COMPAT
-            || (((char *)value)[value_size - 1] == 'Z')
-#endif
-       ) {
+    if (!strncmp(((char *)value + value_size) - 6, "-00:00", 6) || (((char *)value)[value_size - 1] == 'Z')) {
         /* unknown timezone, timezone format supported for backwards compatibility */
         val->unknown_tz = 1;
     }
@@ -272,7 +268,6 @@ lyplg_type_print_date_and_time(const struct ly_ctx *ctx, const struct lyd_value
     struct lyd_value_date_and_time *val;
     struct tm tm;
     char *ret;
-    const char *unknown_tz;
 
     LYD_VALUE_GET(value, val);
 
@@ -308,14 +303,9 @@ lyplg_type_print_date_and_time(const struct ly_ctx *ctx, const struct lyd_value
                 return NULL;
             }
 
-#ifdef ENABLE_DATE_AND_TIME_TYPE_COMPAT
-            unknown_tz = "-00:00";
-#else
-            unknown_tz = "Z";
-#endif
-            if (asprintf(&ret, "%04d-%02d-%02dT%02d:%02d:%02d%s%s%s",
+            if (asprintf(&ret, "%04d-%02d-%02dT%02d:%02d:%02d%s%sZ",
                     tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
-                    val->fractions_s ? "." : "", val->fractions_s ? val->fractions_s : "", unknown_tz) == -1) {
+                    val->fractions_s ? "." : "", val->fractions_s ? val->fractions_s : "") == -1) {
                 return NULL;
             }
         } else {

tests/utests/types/yang_types.c

@@ -97,11 +97,7 @@ test_data_xml(void **state)
     UTEST_ADD_MODULE(schema, LYS_IN_YANG, NULL, NULL);
 
     /* date-and-time */
-#ifdef ENABLE_DATE_AND_TIME_TYPE_COMPAT
-    TEST_SUCCESS_XML("a", "l", "2005-05-25T23:15:15.88888Z", STRING, "2005-05-25T21:15:15.88888-02:00");
-#else
     TEST_SUCCESS_XML("a", "l", "2005-05-25T23:15:15.88888Z", STRING, "2005-05-25T23:15:15.88888Z");
-#endif
     TEST_SUCCESS_XML("a", "l", "2005-05-31T23:15:15-08:59", STRING, "2005-06-01T06:14:15-02:00");
     TEST_SUCCESS_XML("a", "l", "2005-06-01T11:15:15-11:00", STRING, "2005-06-01T20:15:15-02:00");
 
@@ -116,13 +112,8 @@ test_data_xml(void **state)
     TEST_SUCCESS_XML("a", "l", "2005-05-25T23:15:15.88888+04:30", STRING, "2005-05-25T16:45:15.88888-02:00");
 
     /* unknown timezone -- timezone conversion MUST NOT happen */
-#ifdef ENABLE_DATE_AND_TIME_TYPE_COMPAT
-    TEST_SUCCESS_XML("a", "l", "2017-02-01T00:00:00-00:00", STRING, "2017-02-01T00:00:00-00:00");
-    TEST_SUCCESS_XML("a", "l", "2021-02-29T00:00:00-00:00", STRING, "2021-03-01T00:00:00-00:00");
-#else
     TEST_SUCCESS_XML("a", "l", "2017-02-01T00:00:00-00:00", STRING, "2017-02-01T00:00:00Z");
     TEST_SUCCESS_XML("a", "l", "2021-02-29T00:00:00-00:00", STRING, "2021-03-01T00:00:00Z");
-#endif
 
     TEST_ERROR_XML("a", "l", "2005-05-31T23:15:15.-08:00", LY_EVALID);
     CHECK_LOG_CTX("Unsatisfied pattern - \"2005-05-31T23:15:15.-08:00\" does not match "