raster pushed a commit to branch master.
commit 76229f7a2f2db3ed0951c1288f668243218ceba8
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Tue Jul 16 16:47:08 2013 +0900
fix clang nonnull warning.
---
src/lib/evas/canvas/evas_object_textblock.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index 3da3017..510c551 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -3123,6 +3123,12 @@ _layout_calculate_format_item_size(const Evas_Object
*eo_obj,
s = fi->item;
w = fi->parent.w;
h = fi->parent.h;
+ if (!s)
+ {
+ *_w = w;
+ *_h = h;
+ return;
+ }
switch (fi->size)
{
case SIZE:
@@ -3138,7 +3144,7 @@ _layout_calculate_format_item_size(const Evas_Object
*eo_obj,
}
break;
case SIZE_REL:
- p = strstr((char *) s, " relsize=");
+ p = strstr(s, " relsize=");
p += 9;
if (sscanf(p, "%ix%i", &w, &h) == 2)
{
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
