summaryrefslogtreecommitdiff
path: root/scheduler/type.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-05-10 22:58:10 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-05-10 22:58:10 +0000
commitcc75483441ba4241a6b0079e028d7699d99a6b0f (patch)
tree07af3321d8e2ad36d8fad169a15674ce7cc4c460 /scheduler/type.c
parent6d2f911bdd077fee9489b1084b960c4e68fc0658 (diff)
downloadcups-cc75483441ba4241a6b0079e028d7699d99a6b0f.tar.gz
Merge changes from CUPS 1.5svn-r9136.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2180 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/type.c')
-rw-r--r--scheduler/type.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/scheduler/type.c b/scheduler/type.c
index 717aa1f2a..6f4706e20 100644
--- a/scheduler/type.c
+++ b/scheduler/type.c
@@ -518,15 +518,18 @@ mimeAddTypeRule(mime_type_t *mt, /* I - Type to add to */
if (length[1] == 1)
temp->value.charv = value[1][0];
else
- temp->value.charv = (char)strtol(value[1], NULL, 0);
+ temp->value.charv = (unsigned char)strtol(value[1], NULL, 0);
+
+ DEBUG_printf(("1mimeAddTypeRule: CHAR(%d,0x%02x)", temp->offset,
+ temp->value.charv));
break;
case MIME_MAGIC_SHORT :
temp->offset = strtol(value[0], NULL, 0);
- temp->value.shortv = (short)strtol(value[1], NULL, 0);
+ temp->value.shortv = (unsigned short)strtol(value[1], NULL, 0);
break;
case MIME_MAGIC_INT :
temp->offset = strtol(value[0], NULL, 0);
- temp->value.intv = (int)strtol(value[1], NULL, 0);
+ temp->value.intv = (unsigned)strtol(value[1], NULL, 0);
break;
case MIME_MAGIC_LOCALE :
if (length[0] > (sizeof(temp->value.localev) - 1))