Merge branch 'master' of https://github.com/cesnet/libyang

Author: michalvasko

CMakeLists.txt

@@ -11,7 +11,7 @@ set(CMAKE_MACOSX_RPATH TRUE)
 # set version
 set(LIBYANG_MAJOR_VERSION 0)
 set(LIBYANG_MINOR_VERSION 12)
-set(LIBYANG_MICRO_VERSION 199)
+set(LIBYANG_MICRO_VERSION 201)
 set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
 set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION})
 configure_file(${PROJECT_SOURCE_DIR}/src/libyang.h.in ${PROJECT_SOURCE_DIR}/src/libyang.h)

src/parser.c

@@ -1259,11 +1259,13 @@ make_canonical(struct ly_ctx *ctx, int type, const char **value, void *data1, vo
         c = *((uint8_t *)data2);
         if (num) {
             count = sprintf(buf, "%"PRId64" ", num);
-            if ((count - 1) <= c) {
+            if ( (num > 0 && (count - 1) <= c) 
+                 || (count - 2) <= c ) {
                 /* we have 0. value, print the value with the leading zeros
                  * (one for 0. and also keep the correct with of num according
-                 * to fraction-digits value) */
-                count = sprintf(buf, "0%0*"PRId64" ", c, num);
+                 * to fraction-digits value)
+                 * for (num<0) - extra character for '-' sign */
+                count = sprintf(buf, "%0*"PRId64" ", (num > 0) ? (c + 1) : (c + 2), num);
             }
             for (i = c, j = 1; i > 0 ; i--) {
                 if (j && i > 1 && buf[count - 2] == '0') {

tools/lint/main_ni.c

@@ -418,12 +418,12 @@ main_ni(int argc, char* argv[])
         }
     }
     if (!outformat_d && options_dflt) {
-        /* we have options for printing default nodes, but output is schema */
-        fprintf(stderr, "yanglint warning: default mode is ignored when printing schema.\n");
+        /* we have options for printing default nodes, but data output not specified */
+        fprintf(stderr, "yanglint warning: default mode is ignored when not printing data.\n");
     }
-    if (!outformat_d && options_parser) {
+    if (outformat_s && options_parser) {
         /* we have options for printing data tree, but output is schema */
-        fprintf(stderr, "yanglint warning: parser option is ignored when printing schema.\n");
+        fprintf(stderr, "yanglint warning: data parser options are ignored when printing schema.\n");
     }
 
     /* set callback for printing libyang messages */