kernel
/
dtc
mirror of https://git.kernel.org/pub/scm/utils/dtc/dtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix compilation warning/error in setprop_inplace.c 

When compiling the current code-base with gcc 4.6.1, the following warning
is raised, which is interpreted as an error:

cc1: warnings being treated as errors
tests/setprop_inplace.c: In function ‘main’:
tests/setprop_inplace.c:62: error: format ‘%016llx’ expects type ‘long long unsigned int’, but argument 2 has type ‘uint64_t’
tests/setprop_inplace.c:68: error: format ‘%016llx’ expects type ‘long long unsigned int’, but argument 2 has type ‘uint64_t’

Use printf format specifiers from <inttypes.h> to solve this.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
main
Stephen Warren 2012-06-12 14:48:12 -06:00 committed by Jon Loeliger
parent be6026838e
commit 942b3c065f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/setprop_inplace.c
View File

@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

#include <inttypes.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@ -48,7 +49,7 @@ int main(int argc, char *argv[])
verbose_printf("Old int value was 0x%08x\n", *intp);
err = fdt_setprop_inplace_cell(fdt, 0, "prop-int", ~TEST_VALUE_1);
if (err)
FAIL("Failed to set \"prop-int\" to 0x08%x: %s",
FAIL("Failed to set \"prop-int\" to 0x%08x: %s",
~TEST_VALUE_1, fdt_strerror(err));
intp = check_getprop_cell(fdt, 0, "prop-int", ~TEST_VALUE_1);
verbose_printf("New int value is 0x%08x\n", *intp);
@ -59,13 +60,13 @@ int main(int argc, char *argv[])

int64p = check_getprop_64(fdt, 0, "prop-int64", TEST_VALUE64_1);

verbose_printf("Old int64 value was 0x%016llx\n", *int64p);
verbose_printf("Old int64 value was 0x%016" PRIx64 "\n", *int64p);
err = fdt_setprop_inplace_u64(fdt, 0, "prop-int64", ~TEST_VALUE64_1);
if (err)
FAIL("Failed to set \"prop-int64\" to 0x016%llx: %s",
FAIL("Failed to set \"prop-int64\" to 0x%016llx: %s",
~TEST_VALUE64_1, fdt_strerror(err));
int64p = check_getprop_64(fdt, 0, "prop-int64", ~TEST_VALUE64_1);
verbose_printf("New int64 value is 0x%016llx\n", *int64p);
verbose_printf("New int64 value is 0x%016" PRIx64 "\n", *int64p);

strp = check_getprop(fdt, 0, "prop-str", strlen(TEST_STRING_1)+1,
TEST_STRING_1);