summaryrefslogtreecommitdiffstats
path: root/nsprpub/pr/src/io/prscanf.c
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-02-06 11:40:35 +0100
committerwolfbeast <mcwerewolf@gmail.com>2018-02-06 11:40:35 +0100
commit7c728b3c7680662fc4e92b5d03697b8339560b08 (patch)
tree4a0da02f99913e0d52acd52067ad5a7be29e99a3 /nsprpub/pr/src/io/prscanf.c
parent13e9a0c06d35bb02d211df873c105a350aeab8eb (diff)
downloadUXP-7c728b3c7680662fc4e92b5d03697b8339560b08.tar
UXP-7c728b3c7680662fc4e92b5d03697b8339560b08.tar.gz
UXP-7c728b3c7680662fc4e92b5d03697b8339560b08.tar.lz
UXP-7c728b3c7680662fc4e92b5d03697b8339560b08.tar.xz
UXP-7c728b3c7680662fc4e92b5d03697b8339560b08.zip
Update NSPR to 4.16
Diffstat (limited to 'nsprpub/pr/src/io/prscanf.c')
-rw-r--r--nsprpub/pr/src/io/prscanf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nsprpub/pr/src/io/prscanf.c b/nsprpub/pr/src/io/prscanf.c
index 9d75d824e..377a6e643 100644
--- a/nsprpub/pr/src/io/prscanf.c
+++ b/nsprpub/pr/src/io/prscanf.c
@@ -409,7 +409,8 @@ Convert(ScanfState *state, const char *fmt)
ch = GET(state);
if (ch == EOF) {
return NULL;
- } else if (state->assign) {
+ }
+ if (state->assign) {
*cArg++ = ch;
}
}
@@ -602,10 +603,9 @@ StringGetChar(void *stream)
if (*cPtr == '\0') {
return EOF;
- } else {
- *((char **) stream) = cPtr + 1;
- return (unsigned char) *cPtr;
}
+ *((char **) stream) = cPtr + 1;
+ return (unsigned char) *cPtr;
}
static void