[Qemacs-commit] qemacs buffer.c qe.h qe.c image.c video.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        13/12/23 23:26:44

Modified files:
        .              : buffer.c qe.h qe.c image.c video.c 

Log message:
        renamed functions for consistency

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/buffer.c?cvsroot=qemacs&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/qemacs/image.c?cvsroot=qemacs&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/qemacs/video.c?cvsroot=qemacs&r1=1.13&r2=1.14

Patches:
Index: buffer.c
===================================================================
RCS file: /sources/qemacs/qemacs/buffer.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- buffer.c    30 Nov 2013 13:50:12 -0000      1.46
+++ buffer.c    23 Dec 2013 23:26:43 -0000      1.47
@@ -1258,7 +1258,7 @@
 #endif
 
 /* CG: returns number of bytes read, or -1 upon read error */
-int raw_load_buffer1(EditBuffer *b, FILE *f, int offset)
+int raw_buffer_load1(EditBuffer *b, FILE *f, int offset)
 {
     unsigned char buf[IOBUF_SIZE];
     int len, size;
@@ -1325,7 +1325,7 @@
 }
 #endif
 
-static int raw_load_buffer(EditBuffer *b, FILE *f)
+static int raw_buffer_load(EditBuffer *b, FILE *f)
 {
     QEmacsState *qs = &qe_state;
     struct stat st;
@@ -1342,7 +1342,7 @@
     }
 #endif
     if (st.st_size <= qs->max_load_size) {
-        return raw_load_buffer1(b, f, 0);
+        return raw_buffer_load1(b, f, 0);
     }
     return -1;
 }
@@ -1350,7 +1350,7 @@
 /* Write bytes between <start> and <end> to file filename,
  * return bytes written or -1 if error
  */
-static int raw_save_buffer(EditBuffer *b, int start, int end,
+static int raw_buffer_save(EditBuffer *b, int start, int end,
                            const char *filename)
 {
     int fd, len, size, written;
@@ -1391,7 +1391,7 @@
     return written;
 }
 
-static void raw_close_buffer(__unused__ EditBuffer *b)
+static void raw_buffer_close(__unused__ EditBuffer *b)
 {
     /* nothing to do */
 }
@@ -1693,9 +1693,9 @@
 
 EditBufferDataType raw_data_type = {
     "raw",
-    raw_load_buffer,
-    raw_save_buffer,
-    raw_close_buffer,
+    raw_buffer_load,
+    raw_buffer_save,
+    raw_buffer_close,
     NULL, /* next */
 };
 

Index: qe.h
===================================================================
RCS file: /sources/qemacs/qemacs/qe.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- qe.h        19 Dec 2013 01:00:14 -0000      1.101
+++ qe.h        23 Dec 2013 23:26:43 -0000      1.102
@@ -827,7 +827,7 @@
 void do_undo(EditState *s);
 //void do_redo(EditState *s);
 
-int raw_load_buffer1(EditBuffer *b, FILE *f, int offset);
+int raw_buffer_load1(EditBuffer *b, FILE *f, int offset);
 int mmap_buffer(EditBuffer *b, const char *filename);
 int eb_write_buffer(EditBuffer *b, int start, int end, const char *filename);
 int eb_save_buffer(EditBuffer *b);

Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- qe.c        21 Dec 2013 16:24:38 -0000      1.102
+++ qe.c        23 Dec 2013 23:26:43 -0000      1.103
@@ -1585,7 +1585,10 @@
     }
     saved = b->save_log;
     b->save_log = 0;
+    if (b->data_type->buffer_load)
     ret = b->data_type->buffer_load(b, f);
+    else
+        ret = -1;
     b->modified = 0;
     b->save_log = saved;
     if (!f1)
@@ -5570,7 +5573,7 @@
         return;
     }
     /* CG: file charset will not be converted to buffer charset */
-    size = raw_load_buffer1(s->b, f, s->offset);
+    size = raw_buffer_load1(s->b, f, s->offset);
     fclose(f);
 
     /* mark the insert chunk */

Index: image.c
===================================================================
RCS file: /sources/qemacs/qemacs/image.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- image.c     25 Apr 2008 10:46:59 -0000      1.21
+++ image.c     23 Dec 2013 23:26:43 -0000      1.22
@@ -343,7 +343,8 @@
     b->modified = 1;
 }
 
-static int image_buffer_save(EditBuffer *b, const char *filename)
+static int image_buffer_save(EditBuffer *b, int start, int end,
+                             const char *filename)
 {
     ByteIOContext pb1, *pb = &pb1;
     ImageBuffer *ib = b->data;

Index: video.c
===================================================================
RCS file: /sources/qemacs/qemacs/video.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- video.c     18 Jan 2008 17:03:36 -0000      1.13
+++ video.c     23 Dec 2013 23:26:43 -0000      1.14
@@ -85,7 +85,8 @@
     return 0;
 }
 
-static int video_buffer_save(EditBuffer *b, const char *filename)
+static int video_buffer_save(EditBuffer *b, int start, int end,
+                             const char *filename)
 {
     /* cannot save anything */
     return -1;