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

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        08/04/08 09:14:48

Modified files:
        .              : qe.h qe.c 

Log message:
        renames basename to get_basename to avoid conflicts

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.78&r2=1.79

Patches:
Index: qe.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- qe.h        5 Apr 2008 23:04:57 -0000       1.76
+++ qe.h        8 Apr 2008 09:14:47 -0000       1.77
@@ -178,7 +178,7 @@
 int is_directory(const char *path);
 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 *basename(const char *filename);
+const char *get_basename(const char *filename);
 const char *extension(const char *filename);
 char *get_dirname(char *dest, int size, const char *file);
 char *reduce_filename(char *dest, int size, const char *filename);

Index: qe.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- qe.c        5 Apr 2008 23:04:57 -0000       1.78
+++ qe.c        8 Apr 2008 09:14:48 -0000       1.79
@@ -1753,7 +1753,7 @@
     probe_data.real_filename = s->b->filename;
     probe_data.total_size = s->b->total_size;
     probe_data.filename = reduce_filename(fname, sizeof(fname),
-                                          basename(s->b->filename));
+                                          get_basename(s->b->filename));
     /* CG: should pass EditState? QEmacsState ? */
 
     m = m0 = s->mode;
@@ -4586,7 +4586,7 @@
     while (find_file_next(ffst, filename, sizeof(filename)) == 0) {
         struct stat sb;
 
-        base = basename(filename);
+        base = get_basename(filename);
         /* ignore . and .. to force direct match if
          * single entry in directory */
         if (strequal(base, ".") || strequal(base, ".."))
@@ -5297,7 +5297,7 @@
     probe_data.mode = mode;
     probe_data.total_size = total_size;
     probe_data.filename = reduce_filename(fname, sizeof(fname),
-                                          basename(b->filename));
+                                          get_basename(b->filename));
     /* CG: should pass EditState? QEmacsState ? */
 
     m = qs->first_mode;
@@ -7704,7 +7704,7 @@
     {
         const char *p;
 
-        p = basename(argv[0]);
+        p = get_basename(argv[0]);
         if (strequal(p, "ffplay"))
             is_player = 1;
         else