[Qemacs-commit] qemacs buffer.c dired.c html.c makemode.c util....

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        08/04/08 06:54:45

Modified files:
        .              : buffer.c dired.c html.c makemode.c util.c 
        libqhtml       : xmlparse.c 

Log message:
        renames basename to get_basename to avoid conflicts

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/buffer.c?cvsroot=qemacs&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/qemacs/dired.c?cvsroot=qemacs&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/qemacs/html.c?cvsroot=qemacs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/qemacs/makemode.c?cvsroot=qemacs&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/qemacs/util.c?cvsroot=qemacs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/xmlparse.c?cvsroot=qemacs&r1=1.18&r2=1.19

Patches:
Index: buffer.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/buffer.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- buffer.c    5 Apr 2008 23:04:56 -0000       1.38
+++ buffer.c    8 Apr 2008 06:54:44 -0000       1.39
@@ -1495,7 +1495,7 @@
 void eb_set_filename(EditBuffer *b, const char *filename)
 {
     pstrcpy(b->filename, sizeof(b->filename), filename);
-    eb_set_buffer_name(b, basename(filename));
+    eb_set_buffer_name(b, get_basename(filename));
 }
 
 int eb_printf(EditBuffer *b, const char *fmt, ...)

Index: dired.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/dired.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- dired.c     30 Mar 2008 16:10:15 -0000      1.24
+++ dired.c     8 Apr 2008 06:54:44 -0000       1.25
@@ -290,7 +290,7 @@
     while (!find_file_next(ffst, filename, sizeof(filename))) {
         if (lstat(filename, &st) < 0)
             continue;
-        p = basename(filename);
+        p = get_basename(filename);
 
 #if 1   /* CG: bad idea, but causes spurious bugs */
         /* exclude redundant '.' and '..' */

Index: html.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/html.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- html.c      30 Mar 2008 16:10:15 -0000      1.16
+++ html.c      8 Apr 2008 06:54:44 -0000       1.17
@@ -104,7 +104,7 @@
     if (!b)
         return;
     b->flags &= ~BF_READONLY;
-    eb_printf(b, "%s:%d: %s\n", basename(filename), line_num, msg);
+    eb_printf(b, "%s:%d: %s\n", get_basename(filename), line_num, msg);
     b->flags |= ~BF_READONLY;
 }
 
@@ -320,8 +320,7 @@
         }
 
         /* display cursor */
-        if (cursor_found &&
-            s->qe_state->active_window == s) {
+        if (cursor_found && s->qe_state->active_window == s) {
             int x, y, w, h;
 
             x = cursor_pos.x1;

Index: makemode.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/makemode.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- makemode.c  8 Jan 2008 16:37:55 -0000       1.4
+++ makemode.c  8 Apr 2008 06:54:44 -0000       1.5
@@ -146,7 +146,7 @@
 
 static int makefile_mode_probe(ModeProbeData *p)
 {
-    const char *base = basename(p->filename);
+    const char *base = get_basename(p->filename);
 
     /* check file name or extension */
     if (match_extension(base, "mk|mak")

Index: util.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/util.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- util.c      5 Apr 2008 23:04:57 -0000       1.44
+++ util.c      8 Apr 2008 06:54:44 -0000       1.45
@@ -277,7 +277,7 @@
 }
 
 /* Get the filename portion of a path */
-const char *basename(const char *filename)
+const char *get_basename(const char *filename)
 {
     const char *p;
     const char *base;
@@ -303,7 +303,7 @@
 {
     const char *p, *ext;
 
-    p = basename(filename);
+    p = get_basename(filename);
     ext = NULL;
     if (p) {
         while (*p == '.')
@@ -331,7 +331,7 @@
         p = dest;
         if (file) {
             pstrcpy(dest, size, file);
-            p = dest + (basename(dest) - dest);
+            p = dest + (get_basename(dest) - dest);
             if (p > dest + 1 && p[-1] != ':' && p[-2] != ':')
                 p--;
 
@@ -345,7 +345,7 @@
 
 char *reduce_filename(char *dest, int size, const char *filename)
 {
-    const char *base = basename(filename);
+    const char *base = get_basename(filename);
     char *dbase, *ext, *p;
 
     /* Copy path unchanged */
@@ -357,7 +357,7 @@
     
     pstrcat(dest, size, base);
 
-    dbase = dest + (basename(dest) - dest);
+    dbase = dest + (get_basename(dest) - dest);
 
     /* Strip numeric extensions (vcs version numbers) */
     for (;;) {
@@ -437,7 +437,7 @@
 {
     const char *base;
 
-    base = basename(pathname);
+    base = get_basename(pathname);
     if (dirname)
         pstrncpy(dirname, dirname_size, pathname, base - pathname);
     if (filename)

Index: libqhtml/xmlparse.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/libqhtml/xmlparse.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libqhtml/xmlparse.c 8 Jan 2008 16:37:55 -0000       1.18
+++ libqhtml/xmlparse.c 8 Apr 2008 06:54:45 -0000       1.19
@@ -426,7 +426,7 @@
             /* if no alt, display the name of the image */
             value = css_attr_str(box, CSS_ID_src);
             if (value)
-                value = basename(value);
+                value = get_basename(value);
         }
         if (value && value[0] != '\0') {
             arg.type = CSS_VALUE_STRING;