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

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        08/04/09 16:15:46

Modified files:
        .              : dired.c latex-mode.c qe.h util.c 

Log message:
        renamed extension() to get_extension() for consistency
        added safe cast functions s8(): u8* -> char * and const variant cs8()
        strip # suffix in reduce_filename()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/dired.c?cvsroot=qemacs&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/qemacs/latex-mode.c?cvsroot=qemacs&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/qemacs/util.c?cvsroot=qemacs&r1=1.45&r2=1.46

Patches:
Index: dired.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/dired.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- dired.c     8 Apr 2008 06:54:44 -0000       1.25
+++ dired.c     9 Apr 2008 16:15:45 -0000       1.26
@@ -145,7 +145,8 @@
             }
         }
         if (mode & DIRED_SORT_EXTENSION) {
-            res = qe_collate(extension(dip1->name), extension(dip2->name));
+            res = qe_collate(get_extension(dip1->name),
+                             get_extension(dip2->name));
             if (res)
                 break;
         }

Index: latex-mode.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/latex-mode.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- latex-mode.c        8 Apr 2008 11:36:16 -0000       1.27
+++ latex-mode.c        9 Apr 2008 16:15:45 -0000       1.28
@@ -287,7 +287,7 @@
 
     /* strip extension from filename */
     pstrcpy(bname, sizeof(bname), e->b->filename);
-    len = extension(bname) - bname;
+    len = get_extension(bname) - bname;
     bname[len] = '\0';
 
     if (!cmd || cmd[0] == '\0')

Index: qe.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe.h,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- qe.h        8 Apr 2008 19:57:33 -0000       1.79
+++ qe.h        9 Apr 2008 16:15:46 -0000       1.80
@@ -104,6 +104,9 @@
 typedef struct EditBuffer EditBuffer;
 typedef struct QEmacsState QEmacsState;
 
+static inline char *s8(u8 *p) { return (char*)p; }
+static inline const char *cs8(const u8 *p) { return (const char*)p; }
+
 #ifndef INT_MAX
 #define INT_MAX  0x7fffffff
 #endif
@@ -179,7 +182,7 @@
 void canonicalize_path(char *buf, int buf_size, const char *path);
 void canonicalize_absolute_path(char *buf, int buf_size, const char *path1);
 const char *get_basename(const char *filename);
-const char *extension(const char *filename);
+const char *get_extension(const char *filename);
 char *get_dirname(char *dest, int size, const char *file);
 char *reduce_filename(char *dest, int size, const char *filename);
 int match_extension(const char *filename, const char *extlist);

Index: util.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/util.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- util.c      8 Apr 2008 06:54:44 -0000       1.45
+++ util.c      9 Apr 2008 16:15:46 -0000       1.46
@@ -299,7 +299,7 @@
 }
 
 /* Return the last extension in a path, ignoring leading dots */
-const char *extension(const char *filename)
+const char *get_extension(const char *filename)
 {
     const char *p, *ext;
 
@@ -361,7 +361,7 @@
 
     /* Strip numeric extensions (vcs version numbers) */
     for (;;) {
-        ext = dbase + (extension(dbase) - dbase);
+        ext = dbase + (get_extension(dbase) - dbase);
         if (*ext != '.' || !qe_isdigit(ext[1]))
             break;
         *ext = '\0';
@@ -379,9 +379,9 @@
         }
     }
 
-    /* Strip backup file suffix */
+    /* Strip backup file suffix or cvs temp file suffix */
     p = dbase + strlen(dbase);
-    if (p > dbase + 1 && p[-1] == '~')
+    if (p > dbase + 1 && (p[-1] == '~' || p[-1] == '#'))
         *--p = '\0';
 
     return dest;
@@ -391,7 +391,7 @@
 {
     const char *r;
 
-    r = extension(filename);
+    r = get_extension(filename);
     if (*r == '.') {
         return strfind(extlist, r + 1);
     } else {