diff options
| -rw-r--r-- | coreutils/cal.c | 2 | ||||
| -rw-r--r-- | include/unicode.h | 4 | ||||
| -rw-r--r-- | libbb/progress.c | 2 | ||||
| -rw-r--r-- | libbb/unicode.c | 11 | ||||
| -rw-r--r-- | networking/udhcp/dumpleases.c | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/coreutils/cal.c b/coreutils/cal.c index ef5dbeadb..f18c16120 100644 --- a/coreutils/cal.c +++ b/coreutils/cal.c @@ -138,7 +138,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv) if (julian) *hp++ = ' '; { - char *two_wchars = unicode_conv_to_printable_fixedwidth(NULL, buf, 2); + char *two_wchars = unicode_conv_to_printable_fixedwidth(/*NULL,*/ buf, 2); strcpy(hp, two_wchars); free(two_wchars); } diff --git a/include/unicode.h b/include/unicode.h index 1dd55e67d..dee02e777 100644 --- a/include/unicode.h +++ b/include/unicode.h @@ -60,8 +60,8 @@ enum { //UNUSED: unsigned FAST_FUNC unicode_padding_to_width(unsigned width, const char *src); //UNUSED: char* FAST_FUNC unicode_conv_to_printable2(uni_stat_t *stats, const char *src, unsigned width, int flags); char* FAST_FUNC unicode_conv_to_printable(uni_stat_t *stats, const char *src); -char* FAST_FUNC unicode_conv_to_printable_maxwidth(uni_stat_t *stats, const char *src, unsigned maxwidth); -char* FAST_FUNC unicode_conv_to_printable_fixedwidth(uni_stat_t *stats, const char *src, unsigned width); +//UNUSED: char* FAST_FUNC unicode_conv_to_printable_maxwidth(uni_stat_t *stats, const char *src, unsigned maxwidth); +char* FAST_FUNC unicode_conv_to_printable_fixedwidth(/*uni_stat_t *stats,*/ const char *src, unsigned width); # if ENABLE_UNICODE_USING_LOCALE diff --git a/libbb/progress.c b/libbb/progress.c index 3c7355fee..40608b047 100644 --- a/libbb/progress.c +++ b/libbb/progress.c @@ -94,7 +94,7 @@ void FAST_FUNC bb_progress_update(bb_progress_t *p, #if ENABLE_UNICODE_SUPPORT init_unicode(); { - char *buf = unicode_conv_to_printable_fixedwidth(NULL, curfile, 20); + char *buf = unicode_conv_to_printable_fixedwidth(/*NULL,*/ curfile, 20); fprintf(stderr, "\r%s%4u%% ", buf, ratio); free(buf); } diff --git a/libbb/unicode.c b/libbb/unicode.c index cf0c6bed9..08a4c7427 100644 --- a/libbb/unicode.c +++ b/libbb/unicode.c @@ -1107,16 +1107,17 @@ char* FAST_FUNC unicode_conv_to_printable(uni_stat_t *stats, const char *src) { return unicode_conv_to_printable2(stats, src, INT_MAX, 0); } -char* FAST_FUNC unicode_conv_to_printable_maxwidth(uni_stat_t *stats, const char *src, unsigned maxwidth) +char* FAST_FUNC unicode_conv_to_printable_fixedwidth(/*uni_stat_t *stats,*/ const char *src, unsigned width) { - return unicode_conv_to_printable2(stats, src, maxwidth, 0); + return unicode_conv_to_printable2(/*stats:*/ NULL, src, width, UNI_FLAG_PAD); } -char* FAST_FUNC unicode_conv_to_printable_fixedwidth(uni_stat_t *stats, const char *src, unsigned width) + +#ifdef UNUSED +char* FAST_FUNC unicode_conv_to_printable_maxwidth(uni_stat_t *stats, const char *src, unsigned maxwidth) { - return unicode_conv_to_printable2(stats, src, width, UNI_FLAG_PAD); + return unicode_conv_to_printable2(stats, src, maxwidth, 0); } -#ifdef UNUSED unsigned FAST_FUNC unicode_padding_to_width(unsigned width, const char *src) { if (unicode_status != UNICODE_ON) { diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c index a15e409cc..21d62a2d2 100644 --- a/networking/udhcp/dumpleases.c +++ b/networking/udhcp/dumpleases.c @@ -57,7 +57,7 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv) addr.s_addr = lease.lease_nip; #if ENABLE_UNICODE_SUPPORT { - char *uni_name = unicode_conv_to_printable_fixedwidth(NULL, lease.hostname, 19); + char *uni_name = unicode_conv_to_printable_fixedwidth(/*NULL,*/ lease.hostname, 19); printf(" %-16s%s ", inet_ntoa(addr), uni_name); free(uni_name); } |