summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2011-01-11 13:08:28 +0100
committerDenys Vlasenko2011-01-11 13:08:28 +0100
commitdc7e5c46b0204bc3489ee961a631fb00533ae597 (patch)
treebebc35d178b4ceda516e05fa84b967cd461d5399
parent5a163b26451c591187482f99659e5fe639a0616a (diff)
downloadbusybox-dc7e5c46b0204bc3489ee961a631fb00533ae597.zip
busybox-dc7e5c46b0204bc3489ee961a631fb00533ae597.tar.gz
libbb unicode: comment out usused function and unused parameter
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r--coreutils/cal.c2
-rw-r--r--include/unicode.h4
-rw-r--r--libbb/progress.c2
-rw-r--r--libbb/unicode.c11
-rw-r--r--networking/udhcp/dumpleases.c2
5 files changed, 11 insertions, 10 deletions
diff --git a/coreutils/cal.c b/coreutils/cal.c
index ef5dbea..f18c161 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 1dd55e6..dee02e7 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 3c7355f..40608b0 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 cf0c6be..08a4c74 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 a15e409..21d62a2 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);
}