aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-04-19 11:22:31 +0000
committerUlrich Drepper <drepper@redhat.com>1997-04-19 11:22:31 +0000
commit29bb8719cfc14ccaadfdf371c036c33da14a2746 (patch)
tree68024b4195b105603d4dba293e317efe08e82751 /stdio-common
parent307bcd77838a5546a4fa65e7a88258a6ea78898c (diff)
downloadglibc-29bb8719cfc14ccaadfdf371c036c33da14a2746.tar
glibc-29bb8719cfc14ccaadfdf371c036c33da14a2746.tar.gz
glibc-29bb8719cfc14ccaadfdf371c036c33da14a2746.tar.bz2
glibc-29bb8719cfc14ccaadfdf371c036c33da14a2746.zip
Add description of printf_size and printf_size_info.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/printf_size.c4
-rw-r--r--stdio-common/tst-printfsz.c66
2 files changed, 68 insertions, 2 deletions
diff --git a/stdio-common/printf_size.c b/stdio-common/printf_size.c
index 0184269181..6a870127af 100644
--- a/stdio-common/printf_size.c
+++ b/stdio-common/printf_size.c
@@ -96,8 +96,8 @@ printf_size (FILE *fp, const struct printf_info *info, const void *const *args)
/* Units for the both formats. */
static const char units[2][8] =
{
- " kmgtps", /* For binary format. */
- " KMGTPS" /* For decimal format. */
+ " kmgtpezy", /* For binary format. */
+ " KMGTPEZY" /* For decimal format. */
};
const char *tag = units[isupper (info->spec) != 0];
int divisor = isupper (info->spec) ? 1000 : 1024;
diff --git a/stdio-common/tst-printfsz.c b/stdio-common/tst-printfsz.c
new file mode 100644
index 0000000000..fed829c012
--- /dev/null
+++ b/stdio-common/tst-printfsz.c
@@ -0,0 +1,66 @@
+/* Based on code by Larry McVoy <lm@neteng.engr.sgi.com>. */
+#include <printf.h>
+#include <stdio.h>
+
+#define V 12345678.12345678
+
+
+int
+main (int argc, char *argv[])
+{
+ char buf[1024];
+ int result = 0;
+
+ /* Register the printf handlers. */
+ register_printf_function ('b', printf_size, printf_size_info);
+ register_printf_function ('B', printf_size, printf_size_info);
+
+
+ sprintf (buf, "%g %b %B %.0b %.0B %.1b %.1B %8.0b %08.0B",
+ V, 1025., V, V, V, V, V, V, V, V);
+ fputs (buf, stdout);
+ if (strcmp (buf, "\
+1.23457e+07 1.001k 12.346M 12m 12M 11.8m 12.3M 12m 0000012M"))
+ {
+ result = 1;
+ fputs (" -> WRONG\n", stdout);
+ }
+ else
+ fputs (" -> OK\n", stdout);
+
+ sprintf (buf, "%b|%B|%-20.2b|%-10.0b|%-10.8b|%-10.2B|",
+ V, V, V, V, V, V, V, V, V, V, V);
+ fputs (buf, stdout);
+ if (strcmp (buf, "\
+11.774m|12.346M|11.77m |12m |11.77375614m|12.35M |"))
+ {
+ result = 1;
+ fputs (" -> WRONG\n", stdout);
+ }
+ else
+ fputs (" -> OK\n", stdout);
+
+ sprintf (buf, "%#.0B %*.0b %10.*b %*.*B %10.2B",
+ V, 2, V, 2, V, 10, 2, V, V);
+ fputs (buf, stdout);
+ if (strcmp (buf, "12.M 12m 11.77m 12.35M 12.35M"))
+ {
+ result = 1;
+ fputs (" -> WRONG\n", stdout);
+ }
+ else
+ fputs (" -> OK\n", stdout);
+
+ sprintf (buf, "%6B %6.1B %b %B %b %B",
+ V, V, 1000.0, 1000.0, 1024.0, 1024.0);
+ fputs (buf, stdout);
+ if (strcmp (buf, "12.346M 12.3M 1000.000 1.000K 1.000k 1.024K"))
+ {
+ result = 1;
+ fputs (" -> WRONG\n", stdout);
+ }
+ else
+ fputs (" -> OK\n", stdout);
+
+ return result;
+}