garik pushed a commit to branch master.
commit 1373f0ba4a6d61feb270c099ca2d92d1cce9adfb
Author: Igor Murzov <[email protected]>
Date: Sat Apr 13 23:59:30 2013 +0400
Fix incorrect printf format usage
---
src/benchmarks/eina/ecore_hash.c | 6 +++---
src/examples/ecore/ecore_evas_extn_socket_example.c | 2 +-
src/examples/ecore/ecore_pipe_simple_example.c | 2 +-
src/examples/edbus/banshee.c | 2 +-
src/examples/eina/eina_xattr_01.c | 6 ++----
src/lib/ecore_wayland/ecore_wl_input.c | 2 +-
src/lib/ecore_x/xlib/ecore_x_netwm.c | 2 +-
src/lib/edbus/edbus_message_to_eina_value.c | 2 +-
src/modules/ethumb/emotion/emotion.c | 2 +-
9 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/benchmarks/eina/ecore_hash.c b/src/benchmarks/eina/ecore_hash.c
index f957d52..ed14f7b 100644
--- a/src/benchmarks/eina/ecore_hash.c
+++ b/src/benchmarks/eina/ecore_hash.c
@@ -396,14 +396,14 @@ ecore_hash_dump_graph(Ecore_Hash *hash)
for (i = 0; i < ecore_prime_table[hash->size]; i++)
if (hash->buckets[i])
{
- int n = 0;
+ unsigned int n = 0;
Ecore_Hash_Node *node;
for (node = hash->buckets[i]; node; node = node->next)
n++;
- printf("%d\t%u", i, n);
+ printf("%u\t%u", i, n);
}
else
- printf("%d\t0", i);
+ printf("%u\t0", i);
}
diff --git a/src/examples/ecore/ecore_evas_extn_socket_example.c
b/src/examples/ecore/ecore_evas_extn_socket_example.c
index 5090b9c..f171c3f 100644
--- a/src/examples/ecore/ecore_evas_extn_socket_example.c
+++ b/src/examples/ecore/ecore_evas_extn_socket_example.c
@@ -97,7 +97,7 @@ _mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *e
len = strlen(buf);
ecore_evas_data_set(ee, "text", buf);
- printf("ecore extn socket txt = \"%s\" len=%d.", buf, len);
+ printf("ecore extn socket txt = \"%s\" len=%zu.", buf, len);
ecore_evas_msg_send(ee, MSG_DOMAIN_CONTROL_OBJECT, MSG_ID_TEXT, buf, len);
}
diff --git a/src/examples/ecore/ecore_pipe_simple_example.c
b/src/examples/ecore/ecore_pipe_simple_example.c
index 67bd4e7..ab87c31 100644
--- a/src/examples/ecore/ecore_pipe_simple_example.c
+++ b/src/examples/ecore/ecore_pipe_simple_example.c
@@ -27,7 +27,7 @@ handler(void *data, void *buf, unsigned int len)
char *str = malloc(sizeof(char) * len + 1);
memcpy(str, buf, len);
str[len] = '\0';
- printf("received %d bytes\n", len);
+ printf("received %u bytes\n", len);
printf("content: %s\n", (const char *)str);
free(str);
if (len && !strncmp(buf, "close", len < 5 ? len : 5))
diff --git a/src/examples/edbus/banshee.c b/src/examples/edbus/banshee.c
index 62194b3..89a005a 100644
--- a/src/examples/edbus/banshee.c
+++ b/src/examples/edbus/banshee.c
@@ -61,7 +61,7 @@ iterate_dict(void *data EINA_UNUSED, const void *key,
EDBus_Message_Iter *var)
unsigned count;
if (!edbus_message_iter_arguments_get(var, "u", &count))
printf("error2\n");
- printf("PlaylistCount=%d\n", count);
+ printf("PlaylistCount=%u\n", count);
}
else if (!strcmp(skey, "Orderings"))
{
diff --git a/src/examples/eina/eina_xattr_01.c
b/src/examples/eina/eina_xattr_01.c
index c739dfe..e4bf421 100644
--- a/src/examples/eina/eina_xattr_01.c
+++ b/src/examples/eina/eina_xattr_01.c
@@ -14,7 +14,7 @@ main(int argc, char **argv)
"\t%s get <file> <key>\n"
"\t%s del <file> <key>\n"
"\t%s set <file> <key> <value>\n",
- argv[0], argv[0], argv[0]);
+ argv[0], argv[0], argv[0], argv[0]);
return EXIT_FAILURE;
}
@@ -29,7 +29,7 @@ main(int argc, char **argv)
itr = eina_xattr_value_ls(argv[2]);
EINA_ITERATOR_FOREACH(itr, xattr)
- printf("\t%s: %.*s\n", xattr->name, xattr->length, xattr->value);
+ printf("\t%s: %.*s\n", xattr->name, (int)xattr->length,
xattr->value);
eina_iterator_free(itr);
eina_shutdown();
@@ -68,8 +68,6 @@ main(int argc, char **argv)
}
else if (strcmp(argv[1], "set") == 0)
{
- size_t size = 0;
- const char *value;
Eina_Bool ret;
if (argc < 5)
diff --git a/src/lib/ecore_wayland/ecore_wl_input.c
b/src/lib/ecore_wayland/ecore_wl_input.c
index 03efbfa..4732055 100644
--- a/src/lib/ecore_wayland/ecore_wl_input.c
+++ b/src/lib/ecore_wayland/ecore_wl_input.c
@@ -572,7 +572,7 @@ _ecore_wl_input_cb_keyboard_key(void *data, struct
wl_keyboard *keyboard EINA_UN
memset(keyname, 0, sizeof(keyname));
xkb_keysym_get_name(sym, keyname, sizeof(keyname));
if (keyname[0] == '\0')
- snprintf(keyname, sizeof(keyname), "Keycode-%i", code);
+ snprintf(keyname, sizeof(keyname), "Keycode-%u", code);
memset(string, 0, sizeof(string));
if (xkb_keysym_to_utf8(sym, string, 32) <= 0)
diff --git a/src/lib/ecore_x/xlib/ecore_x_netwm.c
b/src/lib/ecore_x/xlib/ecore_x_netwm.c
index e212031..a8dc92c 100644
--- a/src/lib/ecore_x/xlib/ecore_x_netwm.c
+++ b/src/lib/ecore_x/xlib/ecore_x_netwm.c
@@ -199,7 +199,7 @@ ecore_x_netwm_desk_names_set(Ecore_X_Window root,
if (!s)
{
/* Default to "Desk-<number>" */
- sprintf(ss, "Desk-%d", i);
+ sprintf(ss, "Desk-%u", i);
s = ss;
}
diff --git a/src/lib/edbus/edbus_message_to_eina_value.c
b/src/lib/edbus/edbus_message_to_eina_value.c
index 422f393..2c01a5f 100644
--- a/src/lib/edbus/edbus_message_to_eina_value.c
+++ b/src/lib/edbus/edbus_message_to_eina_value.c
@@ -213,7 +213,7 @@ _message_iter_basic_array_to_eina_value(char type,
Eina_Value *value, EDBus_Mess
}
}
-#define ARG "arg%d"
+#define ARG "arg%u"
typedef struct _EDBus_Struct_Desc
{
diff --git a/src/modules/ethumb/emotion/emotion.c
b/src/modules/ethumb/emotion/emotion.c
index cf5e9b8..5bec7e7 100644
--- a/src/modules/ethumb/emotion/emotion.c
+++ b/src/modules/ethumb/emotion/emotion.c
@@ -155,7 +155,7 @@ _setup_thumbnail(struct _emotion_plugin *_plugin)
for (i = 0; i < _plugin->frnum; i++)
{
- snprintf(buf, sizeof(buf), "images/%d", i);
+ snprintf(buf, sizeof(buf), "images/%u", i);
edje_edit_image_data_add(edje, buf, i);
if (i == 0)
edje_edit_state_image_set(edje, "image", "default", 0.00, buf);
--
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter