dc7e5c46b
Denys Vlasenko
2011-01-11
Subject
libbb unicode: comment out usused function and unused parameter
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/cal.c +1 -1include/unicode.h +2 -2libbb/progress.c +1 -1libbb/unicode.c +6 -5networking/udhcp/dumpleases.c +1 -1
coreutils/cal.c+1 -1
| @@ -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); | |
| } | |
include/unicode.h+2 -2
| @@ -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 | |
libbb/progress.c+1 -1
| @@ -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); | |
| } | |
libbb/unicode.c+6 -5
| @@ -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) { | |
networking/udhcp/dumpleases.c+1 -1
| @@ -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); | |
| } | |