diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:26:57 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2014-04-11 20:26:57 +0000 |
| commit | 293ab3b503b72e3aab497a45a23dbb5102d7dcc1 (patch) | |
| tree | c07d8a9fc2b5752449f9be5ff5f800e158e0aed5 /camlibs/sierra | |
| parent | 18c4ba9cc44f21f71334787d3d09a60cb49d2c66 (diff) | |
| download | libgphoto2-293ab3b503b72e3aab497a45a23dbb5102d7dcc1.tar.gz | |
From: "Daniel P. Berrange" <dan@berrange.com>
The %lld/%llx/%llu format specifiers expect a 'long long'
or 'long long unsigned'. While int64_t/uint64_t are essentially
equivalent, the compiler generates warnings, so add casts to
silence them.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14903 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sierra')
| -rw-r--r-- | camlibs/sierra/sierra-desc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/camlibs/sierra/sierra-desc.c b/camlibs/sierra/sierra-desc.c index 01a7a9a83..ee349b7bd 100644 --- a/camlibs/sierra/sierra-desc.c +++ b/camlibs/sierra/sierra-desc.c @@ -67,8 +67,8 @@ camera_cam_desc_get_value (ValueNameType *val_name_p, CameraWidgetType widge, if ((widge == GP_WIDGET_RADIO) || (widge == GP_WIDGET_MENU)) { gp_widget_add_choice (child, _(val_name_p->name)); GP_DEBUG ("get value %15s:\t%lld (0x%04llx)", - val_name_p->name, val_name_p->u.value, - val_name_p->u.value); + val_name_p->name, (long long)val_name_p->u.value, + (long long unsigned) val_name_p->u.value); /* XXX where is endian handled? */ if ((mask & *(int*) buff) == val_name_p->u.value) { gp_widget_set_value (child, _(val_name_p->name)); @@ -170,7 +170,7 @@ camera_cam_desc_get_widget (Camera *camera, CameraRegisterType *reg_p, * set it to the same as regs_long_name. */ gp_widget_set_info (child, _(reg_desc_p->regs_long_name)); - GP_DEBUG ("reg_value 0x%016llx", reg_p->reg_value); + GP_DEBUG ("reg_value 0x%016llx", (long long unsigned)reg_p->reg_value); for (vind = 0; vind < reg_desc_p->reg_val_name_cnt; vind++) { camera_cam_desc_get_value (®_desc_p->regs_value_names[vind], reg_desc_p->reg_widget_type, reg_p->reg_len, @@ -183,7 +183,7 @@ camera_cam_desc_get_widget (Camera *camera, CameraRegisterType *reg_p, if (((reg_desc_p->reg_widget_type == GP_WIDGET_RADIO) || (reg_desc_p->reg_widget_type == GP_WIDGET_MENU)) && !gp_widget_changed (child)) { - sprintf (buff, _("%lld (unknown)"), reg_p->reg_value); + sprintf (buff, _("%lld (unknown)"), (long long)reg_p->reg_value); gp_widget_add_choice (child, buff); gp_widget_set_value (child, buff); } |