diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
| commit | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (patch) | |
| tree | 9d8233b2f54ad198da3354aa9dbd8d0082156a9c /xorg-server/fonts.src/font-util/ucs2any.c | |
| parent | c14f2432d6bfb3de6c6289efd0471f038a289327 (diff) | |
| parent | 50ace52bb8308fd62b8bad9ae912dc18c4ae32ff (diff) | |
| download | vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.gz vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.bz2 vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/fonts.src/font-util/ucs2any.c')
| -rw-r--r-- | xorg-server/fonts.src/font-util/ucs2any.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xorg-server/fonts.src/font-util/ucs2any.c b/xorg-server/fonts.src/font-util/ucs2any.c index a6e8fb6bb..0904fa02b 100644 --- a/xorg-server/fonts.src/font-util/ucs2any.c +++ b/xorg-server/fonts.src/font-util/ucs2any.c @@ -173,7 +173,7 @@ typedef struct { } da_t; static da_t * -da_new(char *name) +da_new(const char *name) { da_t *da; @@ -246,7 +246,7 @@ da_add(da_t *da, int key, void *value) } static void -da_add_str(da_t *da, int key, char *value) +da_add_str(da_t *da, int key, const char *value) { da_add(da, key, value?zstrdup(value):NULL); } @@ -447,8 +447,8 @@ usage(void) { static int chars_compare(const void *aa, const void *bb) { - int a = *(int *)aa; - int b = *(int *)bb; + int a = *(const int *)aa; + int b = *(const int *)bb; return a - b; } @@ -737,7 +737,6 @@ main(int argc, char *argv[]) if (p[0] == '0' && (p[1] == 'x' || p[1] == 'X')) { ucs = strtol(p+2, &endp, 16); if (*endp == '\0') goto bad; - p = endp; } else goto bad; |