i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Reverted r30843.

Browse Source 
* Don't call abmon_init() when HAVE_NL_LANGINFO is not defined. It would
  always fail.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30847 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-05-24 22:36:24 +00:00
parent 48f1a5b4c9
commit d40c694ea5
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/coreutils/src/ls.c
+3 -5
View File
@@ -1015,10 +1015,10 @@ static char abmon[12][MAX_MON_WIDTH * 2 * MB_LEN_MAX + 1];
/* minimum width needed to align %b, 0 => don't use precomputed values. */ /* minimum width needed to align %b, 0 => don't use precomputed values. */
static size_t required_mon_width; static size_t required_mon_width;
#ifdef HAVE_NL_LANGINFO
static size_t static size_t
abmon_init (void) abmon_init (void)
{ {
#ifdef HAVE_NL_LANGINFO
required_mon_width = MAX_MON_WIDTH; required_mon_width = MAX_MON_WIDTH;
size_t curr_max_width; size_t curr_max_width;
do do
@@ -1043,10 +1043,10 @@ abmon_init (void)
} }
} }
while (curr_max_width > required_mon_width); while (curr_max_width > required_mon_width);
#endif
return required_mon_width; return required_mon_width;
} }
#endif
static size_t static size_t
dev_ino_hash (void const *x, size_t table_size) dev_ino_hash (void const *x, size_t table_size)
@@ -2023,13 +2023,11 @@ decode_switches (int argc, char **argv)
} }
} }
} }
#ifdef HAVE_NL_LANGINFO
/* Note we leave %5b etc. alone so user widths/flags are honored. */ /* Note we leave %5b etc. alone so user widths/flags are honored. */
if (strstr (long_time_format[0],"%b") || strstr (long_time_format[1],"%b")) if (strstr (long_time_format[0],"%b") || strstr (long_time_format[1],"%b"))
if (!abmon_init ()) if (!abmon_init ())
#ifndef __HAIKU__
error (0, 0, _("error initializing month strings")); error (0, 0, _("error initializing month strings"));
#else
;
#endif #endif
} }