Commit - cross/slibtool - dcb4535da0c4e22eafb51a20128c436e3337f8b7

Forked from cross/slibtool 4 years ago

raw patch tree parent

1 file changed. 7 lines added. 5 lines removed.

    driver: fix version-related logic, always invoke slbt_init_version_info().

src/driver/slbt_driver_ctx.c

file modified

+7 -5

src/driver/slbt_driver_ctx.c CHANGED

@@ -451,6 +451,9 @@ static int slbt_init_version_info(
     int    revision;
     int    age;
+    if (!verinfo->verinfo && !verinfo->vernumber)
+        return 0;
+            +
     if (verinfo->vernumber) {
         sscanf(verinfo->vernumber,"%d:%d:%d",
             &verinfo->major,
@@ -810,11 +813,10 @@ int slbt_get_driver_ctx(
     }
     /* version info */
-    if (ctx->cctx.verinfo.verinfo)
-        if (slbt_init_version_info(ctx,&ctx->cctx.verinfo)) {
-            slbt_free_driver_ctx(&ctx->ctx);
-            return -1;
+    if (slbt_init_version_info(ctx,&ctx->cctx.verinfo)) {
+        slbt_free_driver_ctx(&ctx->ctx);
+        return -1;
+    }
-        }
     /* link params */
     if (cctx.mode == SLBT_MODE_LINK)