[Qemacs-commit] qemacs dired.c qe.c qe.h util.c

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        08/04/22 08:15:05

Modified files:
        .              : dired.c qe.c qe.h util.c 

Log message:
        renamed qe_collate -> qe_strcollate, cosmetics

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/dired.c?cvsroot=qemacs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/qemacs/util.c?cvsroot=qemacs&r1=1.50&r2=1.51

Patches:
Index: dired.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/dired.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- dired.c     15 Apr 2008 23:24:03 -0000      1.27
+++ dired.c     22 Apr 2008 08:15:04 -0000      1.28
@@ -145,12 +145,12 @@
             }
         }
         if (mode & DIRED_SORT_EXTENSION) {
-            res = qe_collate(get_extension(dip1->name),
+            res = qe_strcollate(get_extension(dip1->name),
                              get_extension(dip2->name));
             if (res)
                 break;
         }
-        res = qe_collate(dip1->name, dip2->name);
+        res = qe_strcollate(dip1->name, dip2->name);
         break;
     }
     return (mode & DIRED_SORT_DESCENDING) ? -res : res;
@@ -302,13 +302,17 @@
         ct = 0;
         if (S_ISDIR(st.st_mode)) {
             ct = '/';
-        } else if (S_ISFIFO(st.st_mode)) {
+        } else
+        if (S_ISFIFO(st.st_mode)) {
             ct = '|';
-        } else if (S_ISSOCK(st.st_mode)) {
+        } else
+        if (S_ISSOCK(st.st_mode)) {
             ct = '=';
-        } else if (S_ISLNK(st.st_mode)) {
+        } else
+        if (S_ISLNK(st.st_mode)) {
             ct = '@';
-        } else if ((st.st_mode & 0111) != 0) {
+        } else
+        if ((st.st_mode & 0111) != 0) {
             ct = '*';
         }
         if (ct) {
@@ -324,16 +328,19 @@
         /* add file size or file info */
         if (S_ISREG(st.st_mode)) {
             snprintf(buf, sizeof(buf), "%9ld", (long)st.st_size);
-        } else if (S_ISDIR(st.st_mode)) {
+        } else
+        if (S_ISDIR(st.st_mode)) {
             snprintf(buf, sizeof(buf), "%9s", "<dir>");
-        } else if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {
+        } else
+        if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {
             int major, minor;
             major = (st.st_rdev >> 8) & 0xff;
             minor = st.st_rdev & 0xff;
             snprintf(buf, sizeof(buf), "%c%4d%4d",
                      S_ISCHR(st.st_mode) ? 'c' : 'b',
                      major, minor);
-        } else if (S_ISLNK(st.st_mode)) {
+        } else
+        if (S_ISLNK(st.st_mode)) {
             pstrcat(line, sizeof(line), "-> ");
             len = readlink(filename, buf, sizeof(buf) - 1);
             if (len < 0)

Index: qe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- qe.c        20 Apr 2008 12:01:34 -0000      1.87
+++ qe.c        22 Apr 2008 08:15:04 -0000      1.88
@@ -4689,7 +4689,7 @@
     StringItem *item2 = *(StringItem **)p2;
 
     /* Use natural sort: keep numbers in order */
-    return qe_collate(item1->str, item2->str);
+    return qe_strcollate(item1->str, item2->str);
 }
 
 static void complete_end(CompleteState *cp)

Index: qe.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- qe.h        22 Apr 2008 08:11:56 -0000      1.88
+++ qe.h        22 Apr 2008 08:15:04 -0000      1.89
@@ -244,7 +244,7 @@
     return (qe_inrange(c, 'A', 'Z') ? c + 'a' - 'A' : c);
 }
 
-int qe_collate(const char *s1, const char *s2);
+int qe_strcollate(const char *s1, const char *s2);
 void qe_strtolower(char *buf, int buf_size, const char *str);
 void skip_spaces(const char **pp);
 

Index: util.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/util.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- util.c      22 Apr 2008 08:11:56 -0000      1.50
+++ util.c      22 Apr 2008 08:15:04 -0000      1.51
@@ -379,7 +379,7 @@
 
 /* smart compare strings, lexicographical order, but collate numbers in
  * numeric order, and push * at end */
-int qe_collate(const char *s1, const char *s2)
+int qe_strcollate(const char *s1, const char *s2)
 {
     int last, c1, c2, res, flags;