summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorse <se@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>2020-10-30 14:34:51 +0000
committerse <se@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>2020-10-30 14:34:51 +0000
commitb587f0ccbab54aaa1f4cfbe296df3585588bac71 (patch)
treedb27d66f4928fea7f9135eaddf2eb109d30250ee
parentcadaf9d9f227a246b9e3a3df08c49f48164656ed (diff)
downloadfreebsd-b587f0ccbab54aaa1f4cfbe296df3585588bac71.tar.gz
freebsd-b587f0ccbab54aaa1f4cfbe296df3585588bac71.tar.bz2
Revert debug output committed in r367166 by accident
MFC after: 3 days git-svn-id: http://svn.freebsd.org/base/head@367167 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
-rw-r--r--usr.bin/calendar/events.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/calendar/events.c b/usr.bin/calendar/events.c
index 1275c66dca1..39ede509e4d 100644
--- a/usr.bin/calendar/events.c
+++ b/usr.bin/calendar/events.c
@@ -55,7 +55,6 @@ set_new_encoding(void)
const char *newenc;
newenc = nl_langinfo(CODESET);
- fprintf(stderr, "NEWENC=%s\n", newenc); // DEBUG
if (currentEncoding == NULL) {
currentEncoding = strdup(newenc);
if (currentEncoding == NULL)
@@ -99,14 +98,13 @@ convert(char *input)
else
err(1, "Initialization failure");
}
- fprintf(stderr, "CONV=%p\n", conv); // DEBUG
}
inleft = strlen(input);
inbuf = input;
- outlen = inleft + 3;
- if ((output = malloc(outlen)) == NULL)
+ outlen = inleft;
+ if ((output = malloc(outlen + 1)) == NULL)
errx(1, "convert: cannot allocate memory");
for (;;) {
@@ -114,9 +112,7 @@ convert(char *input)
outbuf = output + converted;
outleft = outlen - converted;
- fprintf(stderr, "-< %s %p %ld %ld\n", inbuf, outbuf, inleft, outleft); // DEBUG
converted = iconv(conv, (char **) &inbuf, &inleft, &outbuf, &outleft);
- fprintf(stderr, "-> %ld %s %p %ld %ld\n", converted, inbuf, outbuf, inleft, outleft); // DEBUG
if (converted != (size_t) -1 || errno == EINVAL) {
/* finished or invalid multibyte, so truncate and ignore */
break;