Simplify and rename mmap_full_file().

[adu.git] / format.c

diff --git a/format.c b/format.c
index 02edf37aaf15f27154fd1cefbb7c02515f7b3ba2..94315e95fee7411b12b2a7d302a9efd5b2cff62e 100644 (file)
--- a/format.c
+++ b/format.c
@@ -1,10 +1,10 @@
 /*
- * Copyright (C) 2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file format.c Functions for pretty-printing numbers and strings. */
+/** \file format.c \brief Functions for pretty-printing numbers and strings. */
 
 #include <dirent.h> /* readdir() */
 #include "adu.h"
@@ -14,12 +14,13 @@
 #include "error.h"
 #include "format.h"
 
+/** The three different alignment types. */
 enum alignment {ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER};
 
 struct num_format {
        enum alignment align;
        char unit;
-       int supress_unit;
+       int suppress_unit;
 };
 
 struct string_format {
@@ -128,17 +129,17 @@ static int parse_atom(char *ap, struct atom *atoms, struct format_item **result)
                case AT_ID:
                        fi->af.nf.align = ALIGN_RIGHT;
                        fi->af.nf.unit = ' ';
-                       fi->af.nf.supress_unit = 0;
+                       fi->af.nf.suppress_unit = 0;
                        break;
                case AT_COUNT:
                        fi->af.nf.align = ALIGN_RIGHT;
                        fi->af.nf.unit = 'H';
-                       fi->af.nf.supress_unit = 0;
+                       fi->af.nf.suppress_unit = 0;
                        break;
                case AT_SIZE:
                        fi->af.nf.align = ALIGN_RIGHT;
                        fi->af.nf.unit = 'h';
-                       fi->af.nf.supress_unit = 0;
+                       fi->af.nf.suppress_unit = 0;
                        break;
                }
                if (!col)
@@ -190,7 +191,7 @@ static int parse_atom(char *ap, struct atom *atoms, struct format_item **result)
                        goto err;
                }
                if (col[1] == '*') {
-                       fi->af.nf.supress_unit = 1;
+                       fi->af.nf.suppress_unit = 1;
                        col++;
                }
                for (j = 0; units[j]; j++) {
@@ -374,7 +375,7 @@ static long long unsigned normalize_number(long long unsigned num, char unit,
 static void get_unit_postfix(struct num_format *nf, char eu, enum atom_type type,
                char postfix[2])
 {
-       if (nf->supress_unit) {
+       if (nf->suppress_unit) {
                *postfix = '\0';
                return;
        }
@@ -448,9 +449,7 @@ char *format_items(struct format_info *info, union atom_value *values)
                        align = af->sf.align;
                        val = align_string(values[idx].string_value, fi->width, align);
                } else {
-                       char unit;
                        align = af->nf.align;
-                       unit = af->nf.unit;
                        val = align_unsigned_int(values[idx].num_value,
                                fi->width, &af->nf, type);
                }