<div dir="ltr">Reviewed-by: Jasper St. Pierre <<a href="mailto:jstpierre@mecheye.net">jstpierre@mecheye.net</a>><br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Oct 29, 2013 at 9:55 PM, Alan Coopersmith <span dir="ltr"><<a href="mailto:alan.coopersmith@oracle.com" target="_blank">alan.coopersmith@oracle.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Missed in xalloc -> malloc etal conversion in 0cdc9b8f850342<br>
<br>
Signed-off-by: Alan Coopersmith <<a href="mailto:alan.coopersmith@oracle.com">alan.coopersmith@oracle.com</a>><br>
---<br>
src/FreeType/ftfuncs.c | 4 ++--<br>
src/FreeType/xttcap.c | 20 --------------------<br>
src/FreeType/xttcap.h | 9 ---------<br>
3 files changed, 2 insertions(+), 31 deletions(-)<br>
<br>
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c<br>
index 918e3f3..091339d 100644<br>
--- a/src/FreeType/ftfuncs.c<br>
+++ b/src/FreeType/ftfuncs.c<br>
@@ -2204,7 +2204,7 @@ FreeTypeSetUpTTCap( char *fileName, FontScalablePtr vals,<br>
strcpy(*dynStrRealFileName+dirLen, p2+1);<br>
capHead = p1;<br>
} else {<br>
- *dynStrRealFileName = xstrdup(fileName);<br>
+ *dynStrRealFileName = strdup(fileName);<br>
if( *dynStrRealFileName == NULL ) {<br>
result = AllocError;<br>
goto quit;<br>
@@ -2549,7 +2549,7 @@ FreeTypeSetUpTTCap( char *fileName, FontScalablePtr vals,<br>
if (SPropRecValList_search_record(&listPropRecVal,<br>
&contRecValue,<br>
"CodeRange")) {<br>
- *dynStrTTCapCodeRange = xstrdup(SPropContainer_value_str(contRecValue));<br>
+ *dynStrTTCapCodeRange = strdup(SPropContainer_value_str(contRecValue));<br>
if( *dynStrTTCapCodeRange == NULL ) {<br>
result = AllocError;<br>
goto quit;<br>
diff --git a/src/FreeType/xttcap.c b/src/FreeType/xttcap.c<br>
index bf25cc5..c1d8e67 100644<br>
--- a/src/FreeType/xttcap.c<br>
+++ b/src/FreeType/xttcap.c<br>
@@ -682,24 +682,4 @@ SPropRecValList_add_by_font_cap(SDynPropRecValList *pThisList,<br>
return result;<br>
}<br>
<br>
-<br>
-/**************************************************************************<br>
- Functions (xttmisc)<br>
- */<br>
-<br>
-/* strdup clone with using the allocator of X server */<br>
-char *<br>
-XttXstrdup(char const *str)<br>
-{<br>
- char *result;<br>
-<br>
- result = malloc(strlen(str)+1);<br>
-<br>
- if (result)<br>
- strcpy(result, str);<br>
-<br>
- return result;<br>
-}<br>
-<br>
-<br>
/* end of file */<br>
diff --git a/src/FreeType/xttcap.h b/src/FreeType/xttcap.h<br>
index 2931098..2822540 100644<br>
--- a/src/FreeType/xttcap.h<br>
+++ b/src/FreeType/xttcap.h<br>
@@ -116,15 +116,6 @@ SPropRecValList_dump(SRefPropRecValList *refList);<br>
#define SPropContainer_value_str(contRecVal)\<br>
((contRecVal)->uValue.dynStringValue)<br>
<br>
-/******************************************************<br>
- Prototypes (xttmisc)<br>
- */<br>
-<br>
-/* strdup clone */<br>
-char * XttXstrdup(char const *str);<br>
-#undef xstrdup<br>
-#define xstrdup(s) XttXstrdup((char const*)s)<br>
-<br>
#endif /* !def _XTTCAP_H_ */<br>
<br>
/* end of file */<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.9.2<br>
<br>
_______________________________________________<br>
<a href="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</a>: X.Org development<br>
Archives: <a href="http://lists.x.org/archives/xorg-devel" target="_blank">http://lists.x.org/archives/xorg-devel</a><br>
Info: <a href="http://lists.x.org/mailman/listinfo/xorg-devel" target="_blank">http://lists.x.org/mailman/listinfo/xorg-devel</a><br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br> Jasper<br>
</div>