Module Name: src
Committed By: agc
Date: Sat Aug 7 04:53:56 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libmj: mj.c
Log Message:
fix up 64-bit lint
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c:1.2 src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c:1.3
--- src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c:1.2 Sat Aug 7 04:50:35 2010
+++ src/crypto/external/bsd/netpgp/dist/src/libmj/mj.c Sat Aug 7 04:53:56 2010
@@ -44,7 +44,7 @@
int i;
if (n < 0) {
- n = strlen(s);
+ n = (int)strlen(s);
}
NEWARRAY(char, cp, (n * 2) + 1, "strnsave", return NULL);
if (esc) {
@@ -107,7 +107,7 @@
{
atom->type = MJ_STRING;
atom->value.s = strnsave(s, -1, 1);
- atom->c = strlen(atom->value.s);
+ atom->c = (unsigned)strlen(atom->value.s);
}
#define MJ_OPEN_BRACKET (MJ_OBJECT + 1) /* 8 */
@@ -265,11 +265,11 @@
switch(atom->type = *tok = gettok(s, from, to, tok)) {
case MJ_NUMBER:
atom->value.s = strnsave(&s[*from], *to - *from, 1);
- atom->c = atom->size = strlen(atom->value.s);
+ atom->c = atom->size = (unsigned)strlen(atom->value.s);
return gettok(s, from, to, tok);
case MJ_STRING:
atom->value.s = strnsave(&s[*from + 1], *to - *from - 2, 1);
- atom->c = atom->size = strlen(atom->value.s);
+ atom->c = atom->size = (unsigned)strlen(atom->value.s);
return gettok(s, from, to, tok);
case MJ_NULL:
case MJ_FALSE:
@@ -351,7 +351,7 @@
case MJ_NUMBER:
(void) memcpy(dst, src, sizeof(*dst));
dst->value.s = strnsave(src->value.s, -1, 0);
- dst->c = dst->size = strlen(dst->value.s);
+ dst->c = dst->size = (unsigned)strlen(dst->value.s);
return 1;
case MJ_ARRAY:
case MJ_OBJECT:
