mesa mkfontscale pixman git update 28 jan 2013

mesa: 87592cff57feef29565150b9203e220b50623f30
mkfontscale: b3af8de8d25128f565c2ed2f7c63b6e4099eb84e
pixman: 65fc1adb6545737058e938105ae948a3607c277c

1 files changed, 12 insertions, 15 deletions

diff --git a/mkfontscale/hash.c b/mkfontscale/hash.c
index c2cf9caa3..3adfb6861 100644
--- a/mkfontscale/hash.c
+++ b/mkfontscale/hash.c
@@ -20,6 +20,8 @@
   THE SOFTWARE.
 */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -41,14 +43,11 @@ hash(const char *string)
 }
 
 static void
-strcpy_lwr(char *dst, const char *src)
+str_tolower(char *s)
 {
-    while(1) {
-        *dst = tolower(*src);
-        if(*src == '\0')
-            break;
-        src++;
-        dst++;
+    while(*s != '\0') {
+        *s = tolower(*s);
+        s++;
     }
 }
 
@@ -97,12 +96,11 @@ putHash(HashTablePtr table, char *key, char *value, int prio)
     for(bp = table[i]; bp; bp = bp->next) {
         if(strcasecmp(bp->key, key) == 0) {
             if(prio > bp->prio) {
-                keycopy = malloc(strlen(key) + 1);
+                keycopy = strdup(key);
                 if(keycopy == NULL) goto fail;
-                strcpy_lwr(keycopy, key);
-                valuecopy = malloc(strlen(value) + 1);
+                str_tolower(keycopy);
+                valuecopy = strdup(value);
                 if(valuecopy == NULL) goto fail;
-                strcpy(valuecopy, value);
                 free(bp->key);
                 free(bp->value);
                 bp->key = keycopy;
@@ -111,14 +109,13 @@ putHash(HashTablePtr table, char *key, char *value, int prio)
             return 1;
         }
     }
-    keycopy = malloc(strlen(key) + 1);
+    keycopy = strdup(key);
     if(keycopy == NULL)
         goto fail;
-    strcpy_lwr(keycopy, key);
-    valuecopy = malloc(strlen(value) + 1);
+    str_tolower(keycopy);
+    valuecopy = strdup(value);
     if(valuecopy == NULL)
         goto fail;
-    strcpy(valuecopy, value);
     bp = malloc(sizeof(HashBucketRec));
     if(bp == NULL)
         goto fail;