* src/crcio.c (fread_txt): responded to (gcc -Wall) compiler warnings.

* src/header.c (generic_to_unix_stamp): ditto.

* src/lha_macro.h: ditto.

* src/lhadd.c (delete): ditto.

* src/lharc.c (open_old_archive): ditto.

* src/lhlist.c (list_one): ditto.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/lha/lha/trunk@410 6a8cc165-1e22-0410-a132-eb4e3f353aba

diff --git a/src/crcio.c b/src/crcio.c
index 52f1829..e912af9 100644 (file)
--- a/src/crcio.c
+++ b/src/crcio.c
@@ -304,7 +304,7 @@ fread_txt(p, n, fp)
                                c = '\r';
                        }
 #ifdef EUC
-                       else if (euc_mode && (c == 0x8E || 0xA0 < c && c < 0xFF)) {
+                       else if (euc_mode && (c == 0x8E || (0xA0 < c && c < 0xFF))) {
                                int             d = fgetc(fp);
                                if (d == EOF) {
                                        *p++ = c;

diff --git a/src/header.c b/src/header.c
index 1538b04..227630e 100644 (file)
--- a/src/header.c
+++ b/src/header.c
@@ -373,8 +373,8 @@ generic_to_unix_stamp(t)
        dostm.tm_min = t >> 5 & 0x3f;
        dostm.tm_hour = t >> 11 & 0x1f;
        dostm.tm_mday = t >> 16 & 0x1f;
-       dostm.tm_mon = (t >> 16 + 5 & 0x0f) - 1;        /* 0..11 */
-       dostm.tm_year = (t >> 16 + 9 & 0x7f) + 80;
+       dostm.tm_mon = (t >> (16+5) & 0x0f) - 1;        /* 0..11 */
+       dostm.tm_year = (t >> (16+9) & 0x7f) + 80;
 #if 0
        dostm.tm_isdst = 0;     /* correct? */
 #endif

diff --git a/src/lha_macro.h b/src/lha_macro.h
index 9c08316..92d2ccd 100644 (file)
--- a/src/lha_macro.h
+++ b/src/lha_macro.h
@@ -33,14 +33,11 @@
 #endif
 
 #define SJC_FIRST_P(c)                 \
-  (((unsigned char)(c) >= 0x80) &&     \
-   (((unsigned char)(c) < 0xa0) ||     \
-    ((unsigned char)(c) >= 0xe0) &&    \
-    ((unsigned char)(c) < 0xfd)))
+  (((unsigned char)(c) >= 0x80 && (unsigned char)(c) < 0xa0) ||        \
+   ((unsigned char)(c) >= 0xe0 && (unsigned char)(c) < 0xfd))
 #define SJC_SECOND_P(c)                        \
-  (((unsigned char)(c) >= 0x40) &&     \
-   ((unsigned char)(c) < 0xfd) &&      \
-   ((unsigned char)(c) != 0x7f))
+  (((unsigned char)(c) >= 0x40 && (unsigned char)(c) < 0xfd) &&        \
+    (unsigned char)(c) != 0x7f)
 
 #define X0201_KANA_P(c)\
        (0xa0 < (unsigned char)(c) && (unsigned char)(c) < 0xe0)

diff --git a/src/lhadd.c b/src/lhadd.c
index e509252..1c7b4cd 100644 (file)
--- a/src/lhadd.c
+++ b/src/lhadd.c
@@ -237,11 +237,12 @@ delete(oafp, nafp)
                b2 = strtok(NULL, "|");
                if (need_file(b1)) {    /* skip */
                        fseek(oafp, ahdr.packed_size, SEEK_CUR);
-                       if (noexec || !quiet)
+                       if (noexec || !quiet) {
                                if (b2 != NULL)
                                        message("delete %s -> %s", b1, b2);
                                else
                                        message("delete %s", b1);
+            }
                }
                else {          /* copy */
                        if (noexec) {

diff --git a/src/lharc.c b/src/lharc.c
index 24860bf..9e23c02 100644 (file)
--- a/src/lharc.c
+++ b/src/lharc.c
@@ -1065,7 +1065,8 @@ open_old_archive()
                else
                        return NULL;
        }
-       if (p = strrchr(archive_name, '.')) {
+    p = strrchr(archive_name, '.');
+       if (p) {
                if (strucmp(".LZH", p) == 0
                    || strucmp(".LZS", p) == 0
                    || strucmp(".COM", p) == 0  /* DOS SFX */

diff --git a/src/lhlist.c b/src/lhlist.c
index 6a5aad3..e881b4a 100644 (file)
--- a/src/lhlist.c
+++ b/src/lhlist.c
@@ -254,16 +254,17 @@ list_one(hdr)
 
        print_size(hdr->packed_size, hdr->original_size);
 
-       if (verbose_listing)
+       if (verbose_listing) {
                if (hdr->has_crc)
                        printf(" %s %04x", method, hdr->crc);
                else
                        printf(" %s ****", method);
+    }
 
        printf(" ");
        print_stamp(hdr->unix_last_modified_stamp);
 
-       if (!verbose)
+       if (!verbose) {
                if ((mode & UNIX_FILE_SYMLINK) != UNIX_FILE_SYMLINK)
                        printf(" %s", hdr->name);
                else {
@@ -273,7 +274,7 @@ list_one(hdr)
                        b2 = strtok(NULL, "|");
                        printf(" %s -> %s", b1, b2);
                }
-
+    }
        if (verbose)
                printf(" [%d]", hdr->header_level);
        printf("\n");