hexdump: rename struct _fu to struct hexdump_fu and remove its typedef

Signed-off-by: Ondrej Oprala <ooprala@redhat.com>

diff --git a/text-utils/hexdump-display.c b/text-utils/hexdump-display.c
index 21ae62e56538760da50a6ac4b653dd5a43a7693e..7d61ab8220b5b41921e8be958fcd6da3a87bd2c5 100644 (file)
--- a/text-utils/hexdump-display.c
+++ b/text-utils/hexdump-display.c
@@ -179,7 +179,7 @@ void display(void)
 {
        register struct list_head *fs;
        register FS *fss;
-       register FU *fu;
+       register struct hexdump_fu *fu;
        register struct hexdump_pr *pr;
        register int cnt;
        register unsigned char *bp;
@@ -194,7 +194,7 @@ void display(void)
                        fss = list_entry(p, FS, fslist);
 
                        list_for_each(q, &fss->fulist) {
-                               fu = list_entry(q, FU, fulist);
+                               fu = list_entry(q, struct hexdump_fu, fulist);
 
                                if (fu->flags&F_IGNORE)
                                        break;

diff --git a/text-utils/hexdump-parse.c b/text-utils/hexdump-parse.c
index 38c45131bcf563960c17462f0fb9e66fae01e659..e67fcd20d82c1d90689a59cb6c41f6acb7d545e0 100644 (file)
--- a/text-utils/hexdump-parse.c
+++ b/text-utils/hexdump-parse.c
@@ -54,7 +54,7 @@ static void badconv(const char *ch);
 
 #define first_letter(s,f) strchr(f, *(s))
 
-FU *endfu;                                     /* format at end-of-data */
+struct hexdump_fu *endfu;                                      /* format at end-of-data */
 
 void addfile(char *name)
 {
@@ -84,7 +84,7 @@ void add_fmt(const char *fmt)
 {
        const char *p, *savep;
        FS *tfs;
-       FU *tfu;
+       struct hexdump_fu *tfu;
 
        /* Start new linked list of format units. */
        tfs = xcalloc(1, sizeof(FS));
@@ -100,7 +100,7 @@ void add_fmt(const char *fmt)
                        break;
 
                /* Allocate a new format unit and link it in. */
-               tfu = xcalloc(1, sizeof(FU));
+               tfu = xcalloc(1, sizeof(struct hexdump_fu));
                tfu->reps = 1;
 
                INIT_LIST_HEAD(&tfu->fulist);
@@ -156,14 +156,14 @@ static const char *spec = ".#-+ 0123456789";
 
 int block_size(FS *fs)
 {
-       FU *fu;
+       struct hexdump_fu *fu;
        int bcnt, prec, cursize = 0;
        char *fmt;
        struct list_head *p;
 
        /* figure out the data block size needed for each format unit */
        list_for_each (p, &fs->fulist) {
-               fu = list_entry(p, FU, fulist);
+               fu = list_entry(p, struct hexdump_fu, fulist);
                if (fu->bcnt) {
                        cursize += fu->bcnt * fu->reps;
                        continue;
@@ -205,14 +205,14 @@ void rewrite_rules(FS *fs)
 {
        enum { NOTOKAY, USEBCNT, USEPREC } sokay;
        struct hexdump_pr *pr;
-       FU *fu;
+       struct hexdump_fu *fu;
        struct list_head *p, *q;
        char *p1, *p2, *fmtp;
        char savech, cs[3];
        int nconv, prec = 0;
 
        list_for_each (p, &fs->fulist) {
-               fu = list_entry(p, FU, fulist);
+               fu = list_entry(p, struct hexdump_fu, fulist);
                /*
                 * Break each format unit into print units; each
                 * conversion character gets its own.
@@ -412,7 +412,7 @@ isint:                              cs[2] = '\0';
         * gets output from the last iteration of the format unit.
         */
        list_for_each (p, &fs->fulist) {
-               fu = list_entry(p, FU, fulist);
+               fu = list_entry(p, struct hexdump_fu, fulist);
 
                if (list_entry_is_last(&fu->fulist, &fs->fulist) &&
                        fs->bcnt < blocksize &&

diff --git a/text-utils/hexdump.c b/text-utils/hexdump.c
index 5dfbf1a8093f211e6891f893d16af34b97ef3622..cd4bfd4a25790dec70b3e033a3537f3accdad477 100644 (file)
--- a/text-utils/hexdump.c
+++ b/text-utils/hexdump.c
@@ -207,12 +207,12 @@ void hex_free(void)
 {
        struct list_head *p, *pn, *q, *qn, *r, *rn;
        FS *fs;
-       FU *fu;
+       struct hexdump_fu *fu;
        struct hexdump_pr *pr;
        list_for_each_safe(p, pn, &fshead) {
                fs = list_entry(p, FS, fslist);
                list_for_each_safe(q, qn, &fs->fulist) {
-                       fu = list_entry(q, FU, fulist);
+                       fu = list_entry(q, struct hexdump_fu, fulist);
                        list_for_each_safe(r, rn, &fu->prlist) {
                                pr = list_entry(r, struct hexdump_pr, prlist);
                                free(pr->fmt);

diff --git a/text-utils/hexdump.h b/text-utils/hexdump.h
index 6841cf43c27f0cf6d9fb698d56ef3e224cce36bd..b047db1a912ea200a6ae7651138044b978bc617f 100644 (file)
--- a/text-utils/hexdump.h
+++ b/text-utils/hexdump.h
@@ -55,7 +55,7 @@ struct hexdump_pr {
        char *nospace;                  /* no whitespace version */
 };
 
-typedef struct _fu {
+struct hexdump_fu {
        struct list_head fulist;                /* next format unit */
        struct list_head prlist;                /* next print unit */
 #define        F_IGNORE        0x01            /* %_A */
@@ -64,7 +64,7 @@ typedef struct _fu {
        int reps;                       /* repetition count */
        int bcnt;                       /* byte count */
        char *fmt;                      /* format string */
-} FU;
+};
 
 typedef struct _fs {                   /* format strings */
        struct list_head fslist;                /* linked list of format strings */
@@ -72,7 +72,7 @@ typedef struct _fs {                  /* format strings */
        int bcnt;
 } FS;
 
-extern FU *endfu;
+extern struct hexdump_fu *endfu;
 extern struct list_head fshead;                        /* head of format strings list */
 extern ssize_t blocksize;              /* data block size */
 extern int exitval;                    /* final exit value */