Date: Fri, 30 Oct 2020 14:34:51 +0000 (UTC) From: =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367167 - head/usr.bin/calendar Message-ID: <202010301434.09UEYpdt079021@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Fri Oct 30 14:34:51 2020 New Revision: 367167 URL: https://svnweb.freebsd.org/changeset/base/367167 Log: Revert debug output committed in r367166 by accident MFC after: 3 days Modified: head/usr.bin/calendar/events.c Modified: head/usr.bin/calendar/events.c ============================================================================== --- head/usr.bin/calendar/events.c Fri Oct 30 14:32:13 2020 (r367166) +++ head/usr.bin/calendar/events.c Fri Oct 30 14:34:51 2020 (r367167) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010301434.09UEYpdt079021>