Commit e5c57dd1 authored by Jamie McCrae's avatar Jamie McCrae Committed by Dominik Ermel
Browse files

boot_serial: Only have build number if non-zero 



Only returns the build number in versions responses if the value
is non-zero.

Signed-off-by: default avatarJamie McCrae <jamie.mccrae@nordicsemi.no>
parent 8a3b32ce

boot/boot_serial/src/boot_serial.c

+13 −4
Original line number Diff line number Diff line
@@ -196,9 +196,12 @@ bs_list_img_ver(char *dst, int maxlen, struct image_version *ver) 
    off += u32toa(dst + off, ver->iv_minor);

    dst[off++] = '.';

    off += u32toa(dst + off, ver->iv_revision);



    if (ver->iv_build_num != 0) {

        dst[off++] = '.';

        off += u32toa(dst + off, ver->iv_build_num);

    }

}

#else

/*

 * dst has to be able to fit "255.255.65535.4294967295" (25 characters).
@@ -206,8 +209,14 @@ bs_list_img_ver(char *dst, int maxlen, struct image_version *ver) 
static void

bs_list_img_ver(char *dst, int maxlen, struct image_version *ver)

{

   snprintf(dst, maxlen, "%hu.%hu.%hu.%u", (uint16_t)ver->iv_major,

            (uint16_t)ver->iv_minor, ver->iv_revision, ver->iv_build_num);

   int len;



   len = snprintf(dst, maxlen, "%hu.%hu.%hu", (uint16_t)ver->iv_major,

                  (uint16_t)ver->iv_minor, ver->iv_revision);



   if (ver->iv_build_num != 0 && len > 0 && len < maxlen) {

      snprintf(&dst[len], (maxlen - len), "%u", ver->iv_build_num);

   }

}

#endif /* !MCUBOOT_USE_SNPRINTF */

CRA Git | Maintained and supported by SUSTech CRA and CCSE