summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2014-01-13 17:15:20 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2014-01-14 14:23:04 +0900
commit1d99c82381043d9bf2670e5261bdf157d478b75b (patch)
treeb6b879cb703df151a9d0e1dd1080e433b9d3691c /src/bin
parenta0dc5c16acb0eae963581a570e925f2b95bb1560 (diff)
Evas/cserve2: Improve error messages a bit
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/evas/evas_cserve2_cache.c17
-rw-r--r--src/bin/evas/evas_cserve2_main.c4
2 files changed, 11 insertions, 10 deletions
diff --git a/src/bin/evas/evas_cserve2_cache.c b/src/bin/evas/evas_cserve2_cache.c
index f4ce05ed33..d9f7064804 100644
--- a/src/bin/evas/evas_cserve2_cache.c
+++ b/src/bin/evas/evas_cserve2_cache.c
@@ -1591,17 +1591,15 @@ _image_entry_new(Client *client, int rid,
1591 ref = eina_hash_find(client->files.referencing, &client_file_id); 1591 ref = eina_hash_find(client->files.referencing, &client_file_id);
1592 if (!ref) 1592 if (!ref)
1593 { 1593 {
1594 ERR("Couldn't find file id for client image id: %d", 1594 ERR("Couldn't find file id for client image id: %d", client_file_id);
1595 client_file_id); 1595 cserve2_client_error_send(client, rid, CSERVE2_INVALID_CACHE);
1596 cserve2_client_error_send(client, rid,
1597 CSERVE2_INVALID_CACHE);
1598 return NULL; 1596 return NULL;
1599 } 1597 }
1600 fd = _file_data_find(ref->entry->id); 1598 fd = _file_data_find(ref->entry->id);
1601 if (!fd || fd->invalid) 1599 if (!fd || fd->invalid)
1602 { 1600 {
1603 cserve2_client_error_send(client, rid, 1601 ERR("Can't find file data %d (rid %d)", ref->entry->id, rid);
1604 CSERVE2_FILE_CHANGED); 1602 cserve2_client_error_send(client, rid, CSERVE2_FILE_CHANGED);
1605 return NULL; 1603 return NULL;
1606 } 1604 }
1607 1605
@@ -2922,8 +2920,8 @@ cserve2_cache_image_load(Client *client, unsigned int client_image_id, unsigned
2922 ref = eina_hash_find(client->images.referencing, &client_image_id); 2920 ref = eina_hash_find(client->images.referencing, &client_image_id);
2923 if (!ref) 2921 if (!ref)
2924 { 2922 {
2925 ERR("Can't load: client %d has no image id %d", 2923 ERR("Can't load: client %d has no image id %d (rid %d)",
2926 client->id, client_image_id); 2924 client->id, client_image_id, rid);
2927 cserve2_client_error_send(client, rid, CSERVE2_NOT_LOADED); 2925 cserve2_client_error_send(client, rid, CSERVE2_NOT_LOADED);
2928 return; 2926 return;
2929 } 2927 }
@@ -2932,6 +2930,7 @@ cserve2_cache_image_load(Client *client, unsigned int client_image_id, unsigned
2932 idata = _image_data_find(ENTRYID(ientry)); 2930 idata = _image_data_find(ENTRYID(ientry));
2933 if (!idata) 2931 if (!idata)
2934 { 2932 {
2933 ERR("Can't load image %d for rid %d: data not found", ENTRYID(ientry), rid);
2935 cserve2_client_error_send(client, rid, CSERVE2_INVALID_CACHE); 2934 cserve2_client_error_send(client, rid, CSERVE2_INVALID_CACHE);
2936 return; 2935 return;
2937 } 2936 }
@@ -2939,6 +2938,8 @@ cserve2_cache_image_load(Client *client, unsigned int client_image_id, unsigned
2939 fd = _file_data_find(idata->file_id); 2938 fd = _file_data_find(idata->file_id);
2940 if (!fd || fd->invalid) 2939 if (!fd || fd->invalid)
2941 { 2940 {
2941 ERR("Can't load image %d for rid %d%s", idata->file_id, rid,
2942 fd->invalid ? ": invalid" : "");
2942 cserve2_client_error_send(client, rid, CSERVE2_FILE_CHANGED); 2943 cserve2_client_error_send(client, rid, CSERVE2_FILE_CHANGED);
2943 return; 2944 return;
2944 } 2945 }
diff --git a/src/bin/evas/evas_cserve2_main.c b/src/bin/evas/evas_cserve2_main.c
index 1e8fd182dc..1f2102a5c0 100644
--- a/src/bin/evas/evas_cserve2_main.c
+++ b/src/bin/evas/evas_cserve2_main.c
@@ -144,8 +144,8 @@ _cserve2_client_open(Client *client)
144 end = key + strlen(key) + 1; 144 end = key + strlen(key) + 1;
145 145
146 INF("Received OPEN command: RID=%d", msg->base.rid); 146 INF("Received OPEN command: RID=%d", msg->base.rid);
147 INF("File_ID: %d, path=\"%s\", key=\"%s\", has_load_opts=%d", 147 INF("File_ID: %d, Image_ID: %d, path=\"%s\", key=\"%s\", has_load_opts=%d",
148 msg->file_id, path, key, (int) msg->has_load_opts); 148 msg->file_id, msg->image_id, path, key, (int) msg->has_load_opts);
149 149
150 if (!key[0]) key = NULL; 150 if (!key[0]) key = NULL;
151 if (msg->has_load_opts) 151 if (msg->has_load_opts)