cedric pushed a commit to branch master.
commit d712a13a7a234865217a03501aebe57aad8fe30d
Author: Jean-Philippe Andre <[email protected]>
Date: Wed Jun 19 15:13:25 2013 +0900
evas/cserve2: use null-terminated strings everywhere.
Some hashtable lookups failed because the keys were added
either with eina_stringshare_add() or e_s_add_lenth() but
looked for with e_s_add_length() only.
Signed-off-by: Cedric Bail <[email protected]>
---
src/bin/evas/evas_cserve2.h | 8 +++----
src/bin/evas/evas_cserve2_cache.c | 45 ++++++++++++++++++---------------------
src/bin/evas/evas_cserve2_fonts.c | 1 +
src/bin/evas/evas_cserve2_main.c | 20 ++++++++---------
4 files changed, 36 insertions(+), 38 deletions(-)
diff --git a/src/bin/evas/evas_cserve2.h b/src/bin/evas/evas_cserve2.h
index f357c62..48ecc5d 100644
--- a/src/bin/evas/evas_cserve2.h
+++ b/src/bin/evas/evas_cserve2.h
@@ -296,10 +296,10 @@ void cserve2_cache_image_load(Client *client, unsigned
int client_image_id, unsi
void cserve2_cache_image_preload(Client *client, unsigned int client_image_id,
unsigned int rid);
void cserve2_cache_image_unload(Client *client, unsigned int client_image_id);
-int cserve2_cache_font_load(Client *client, const char *source, unsigned int
sourcelen, const char *name, unsigned int namelen, unsigned int rend_flags,
unsigned int size, unsigned int dpi, unsigned int rid);
-int cserve2_cache_font_unload(Client *client, const char *source, unsigned int
sourcelen, const char *name, unsigned int namelen, unsigned int rend_flags,
unsigned int size, unsigned int dpi, unsigned int rid);
-int cserve2_cache_font_glyphs_load(Client *client, const char *source,
unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int
rend_flags, unsigned int hint, unsigned int size, unsigned int dpi, unsigned
int *glyphs, unsigned int nglyphs, unsigned int rid);
-int cserve2_cache_font_glyphs_used(Client *client, const char *source,
unsigned int sourcelen, const char *name, unsigned int namelen, unsigned int
hint, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned
int *glyphs, unsigned int nglyphs, unsigned int rid);
+int cserve2_cache_font_load(Client *client, const char *source, const char
*name, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned
int rid);
+int cserve2_cache_font_unload(Client *client, const char *source, const char
*name, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned
int rid);
+int cserve2_cache_font_glyphs_load(Client *client, const char *source, const
char *name, unsigned int rend_flags, unsigned int hint, unsigned int size,
unsigned int dpi, unsigned int *glyphs, unsigned int nglyphs, unsigned int rid);
+int cserve2_cache_font_glyphs_used(Client *client, const char *source, const
char *name, unsigned int hint, unsigned int rend_flags, unsigned int size,
unsigned int dpi, unsigned int *glyphs, unsigned int nglyphs, unsigned int rid);
void cserve2_cache_stats_get(Client *client, unsigned int rid);
void cserve2_cache_font_debug(Client *client, unsigned int rid);
diff --git a/src/bin/evas/evas_cserve2_cache.c
b/src/bin/evas/evas_cserve2_cache.c
index ed8f70c..d485576 100644
--- a/src/bin/evas/evas_cserve2_cache.c
+++ b/src/bin/evas/evas_cserve2_cache.c
@@ -1135,13 +1135,13 @@ _cserve2_font_source_find(const char *name)
}
static Font_Entry *
-_cserve2_font_entry_find(const char *name, unsigned int namelen, unsigned int
size, unsigned int rend_flags, unsigned int dpi)
+_cserve2_font_entry_find(const char *name, unsigned int size, unsigned int
rend_flags, unsigned int dpi)
{
Font_Entry tmp_fe;
Font_Source tmp_fs;
Font_Entry *fe;
- tmp_fs.key = eina_stringshare_add_length(name, namelen);
+ tmp_fs.key = eina_stringshare_add(name);
tmp_fe.src = &tmp_fs;
tmp_fe.size = size;
tmp_fe.rend_flags = rend_flags;
@@ -1431,19 +1431,18 @@ _file_path_join(const char *path, const char *end)
}
static Glyphs_Request *
-_glyphs_request_create(Client *client, const char *source, unsigned int
sourcelen, const char *name, unsigned int namelen, unsigned int hint, unsigned
int rend_flags, unsigned int size, unsigned int dpi, unsigned int *glyphs,
unsigned int nglyphs)
+_glyphs_request_create(Client *client, const char *source, const char *name,
unsigned int hint, unsigned int rend_flags, unsigned int size, unsigned int
dpi, unsigned int *glyphs, unsigned int nglyphs)
{
char *fullname;
Glyphs_Request *req = calloc(1, sizeof(*req));
- if (sourcelen == 0)
+ if (source && !*source)
source = NULL;
- if (namelen == 0)
+ if (name && !*name)
name = NULL;
fullname = _file_path_join(source, name);
- req->fe = _cserve2_font_entry_find(fullname, strlen(fullname) + 1, size,
- rend_flags, dpi);
+ req->fe = _cserve2_font_entry_find(fullname, size, rend_flags, dpi);
free(fullname);
if (!req->fe)
{
@@ -2258,21 +2257,20 @@ cserve2_cache_image_unload(Client *client, unsigned int
client_image_id)
}
int
-cserve2_cache_font_load(Client *client, const char *source, unsigned int
sourcelen, const char *name, unsigned int namelen, unsigned int rend_flags,
unsigned int size, unsigned int dpi, unsigned int rid)
+cserve2_cache_font_load(Client *client, const char *source, const char *name,
unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int rid)
{
Reference *ref;
Font_Source *fs;
Font_Entry *fe;
char *fullname;
- if (sourcelen == 0)
+ if (source && !*source)
source = NULL;
- if (namelen == 0)
+ if (name && !*name)
name = NULL;
fullname = _file_path_join(source, name);
- fe = _cserve2_font_entry_find(fullname, strlen(fullname) + 1, size,
- rend_flags, dpi);
+ fe = _cserve2_font_entry_find(fullname, size, rend_flags, dpi);
if (fe)
{
DBG("found font entry %s, rendflags: %d, size: %d, dpi: %d",
@@ -2311,12 +2309,12 @@ cserve2_cache_font_load(Client *client, const char
*source, unsigned int sourcel
if (source)
{
fs->key = eina_stringshare_add(fullname);
- fs->name = eina_stringshare_add_length(name, namelen);
- fs->file = eina_stringshare_add_length(source, sourcelen);
+ fs->name = eina_stringshare_add(name);
+ fs->file = eina_stringshare_add(source);
}
else
{
- fs->file = eina_stringshare_add_length(name, namelen);
+ fs->file = eina_stringshare_add(name);
fs->key = eina_stringshare_ref(fs->file);
}
eina_hash_direct_add(font_sources, fs->key, fs);
@@ -2336,19 +2334,18 @@ cserve2_cache_font_load(Client *client, const char
*source, unsigned int sourcel
}
int
-cserve2_cache_font_unload(Client *client, const char *source, unsigned int
sourcelen, const char *name, unsigned int namelen, unsigned int rend_flags,
unsigned int size, unsigned int dpi, unsigned int rid EINA_UNUSED)
+cserve2_cache_font_unload(Client *client, const char *source, const char
*name, unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned
int rid EINA_UNUSED)
{
Font_Entry *fe;
char *fullname;
- if (sourcelen == 0)
+ if (source && !*source)
source = NULL;
- if (namelen == 0)
+ if (name && !*name)
name = NULL;
fullname = _file_path_join(source, name);
- fe = _cserve2_font_entry_find(fullname, strlen(fullname) + 1, size,
- rend_flags, dpi);
+ fe = _cserve2_font_entry_find(fullname, size, rend_flags, dpi);
free(fullname);
if (!fe)
@@ -2363,11 +2360,11 @@ cserve2_cache_font_unload(Client *client, const char
*source, unsigned int sourc
}
int
-cserve2_cache_font_glyphs_load(Client *client, const char *source, unsigned
int sourcelen, const char *name, unsigned int namelen, unsigned int hint,
unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int
*glyphs, unsigned int nglyphs, unsigned int rid)
+cserve2_cache_font_glyphs_load(Client *client, const char *source, const char
*name, unsigned int hint, unsigned int rend_flags, unsigned int size, unsigned
int dpi, unsigned int *glyphs, unsigned int nglyphs, unsigned int rid)
{
Glyphs_Request *req;
- req = _glyphs_request_create(client, source, sourcelen, name, namelen,
+ req = _glyphs_request_create(client, source, name,
hint, rend_flags, size, dpi, glyphs, nglyphs);
if (!req)
{
@@ -2390,14 +2387,14 @@ cserve2_cache_font_glyphs_load(Client *client, const
char *source, unsigned int
}
int
-cserve2_cache_font_glyphs_used(Client *client, const char *source, unsigned
int sourcelen, const char *name, unsigned int namelen, unsigned int hint,
unsigned int rend_flags, unsigned int size, unsigned int dpi, unsigned int
*glyphs, unsigned int nglyphs, unsigned int rid EINA_UNUSED)
+cserve2_cache_font_glyphs_used(Client *client, const char *source, const char
*name, unsigned int hint, unsigned int rend_flags, unsigned int size, unsigned
int dpi, unsigned int *glyphs, unsigned int nglyphs, unsigned int rid
EINA_UNUSED)
{
Glyphs_Group *gg;
Eina_List *groups;
Glyphs_Request *req;
DBG("Received report of used glyphs from client %d", client->id);
- req = _glyphs_request_create(client, source, sourcelen, name, namelen,
+ req = _glyphs_request_create(client, source, name,
hint, rend_flags, size, dpi, glyphs, nglyphs);
if (!req)
{
diff --git a/src/bin/evas/evas_cserve2_fonts.c
b/src/bin/evas/evas_cserve2_fonts.c
index 3af9693..6c6628c 100644
--- a/src/bin/evas/evas_cserve2_fonts.c
+++ b/src/bin/evas/evas_cserve2_fonts.c
@@ -270,6 +270,7 @@ _font_slave_load(const void *cmddata, void *data
EINA_UNUSED)
{
if (!msg->ftdata1)
cserve2_font_source_ft_free(fsi);
+ ERR("Could not load font '%s' from source '%s'", msg->name, msg->file);
return NULL;
}
diff --git a/src/bin/evas/evas_cserve2_main.c b/src/bin/evas/evas_cserve2_main.c
index 0c90044..2452517 100644
--- a/src/bin/evas/evas_cserve2_main.c
+++ b/src/bin/evas/evas_cserve2_main.c
@@ -146,22 +146,22 @@ _cserve2_client_font_load(Client *client)
buf = ((char *)msg) + sizeof(*msg);
memcpy(source, buf, msg->sourcelen);
+ source[msg->sourcelen] = 0;
buf += msg->sourcelen;
memcpy(name, buf, msg->pathlen);
+ name[msg->pathlen] = 0;
INF("Received %s command: RID=%d",
(msg->base.type == CSERVE2_FONT_LOAD) ? "FONT_LOAD" : "FONT_UNLOAD",
msg->base.rid);
- INF("Font: %s, rend_flags: %d, size: %d, dpi: %d",
- name, msg->rend_flags, msg->size, msg->dpi);
+ INF("Font: '%s' '%s', rend_flags: %d, size: %d, dpi: %d",
+ source, name, msg->rend_flags, msg->size, msg->dpi);
if (msg->base.type == CSERVE2_FONT_LOAD)
- cserve2_cache_font_load(client, source, msg->sourcelen, name,
- msg->pathlen, msg->rend_flags, msg->size,
+ cserve2_cache_font_load(client, source, name, msg->rend_flags, msg->size,
msg->dpi, msg->base.rid);
else
- cserve2_cache_font_unload(client, source, msg->sourcelen, name,
- msg->pathlen, msg->rend_flags, msg->size,
+ cserve2_cache_font_unload(client, source, name, msg->rend_flags,
msg->size,
msg->dpi, msg->base.rid);
}
@@ -174,8 +174,10 @@ _cserve2_client_font_glyphs_request(Client *client)
buf = ((char *)msg) + sizeof(*msg);
memcpy(source, buf, msg->sourcelen);
+ source[msg->sourcelen] = 0;
buf += msg->sourcelen;
memcpy(fontpath, buf, msg->pathlen);
+ fontpath[msg->pathlen] = 0;
buf += msg->pathlen;
glyphs = malloc(sizeof(*glyphs) * msg->nglyphs);
@@ -185,8 +187,7 @@ _cserve2_client_font_glyphs_request(Client *client)
{
INF("Received CSERVE2_FONT_GLYPHS_LOAD command: RID=%d",
msg->base.rid);
- cserve2_cache_font_glyphs_load(client, source, msg->sourcelen,
- fontpath, msg->pathlen,
+ cserve2_cache_font_glyphs_load(client, source, fontpath,
msg->hint, msg->rend_flags, msg->size,
msg->dpi, glyphs, msg->nglyphs,
msg->base.rid);
@@ -195,8 +196,7 @@ _cserve2_client_font_glyphs_request(Client *client)
{
INF("Received CSERVE2_FONT_GLYPHS_USED command: RID=%d",
msg->base.rid);
- cserve2_cache_font_glyphs_used(client, source, msg->sourcelen,
- fontpath, msg->pathlen,
+ cserve2_cache_font_glyphs_used(client, source, fontpath,
msg->hint, msg->rend_flags, msg->size,
msg->dpi, glyphs, msg->nglyphs,
msg->base.rid);
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
