libbb unicode: comment out usused function and unused parameter

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

diff --git a/coreutils/cal.c b/coreutils/cal.c
index ef5dbeadb50fe4a4246bcbf5c021165e590edff8..f18c161206ad8118660ce0bf379427d7987f539d 100644 (file)
--- 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 1dd55e67d1969564511a5e531b7f3b4bb9585ea1..dee02e7776606c64c4b75902b00833f8e8c17269 100644 (file)
--- 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 3c7355fee51a8f72ed3c876ecd51072821cb9b44..40608b0479b88edce2d89d43a2620e26326cc095 100644 (file)
--- 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 cf0c6bed9754e97663d0fd216a63277de3de9825..08a4c74273826a830599d5a3ce55b005fa8ce5dd 100644 (file)
--- 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 a15e409cc22565237e0faaf7e0a6372a2db705b7..21d62a2d29b1c206c3be15cacb7d5872b8c3cb38 100644 (file)
--- 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);
                }