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

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        07/12/18 12:12:28

Modified files:
        .              : qe.h unicode_join.c 

Log message:
        return success code in load_ligatures

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.h?cvsroot=qemacs&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/qemacs/unicode_join.c?cvsroot=qemacs&r1=1.8&r2=1.9

Patches:
Index: qe.h
===================================================================
RCS file: /cvsroot/qemacs/qemacs/qe.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- qe.h        15 Dec 2007 16:44:31 -0000      1.37
+++ qe.h        18 Dec 2007 12:12:28 -0000      1.38
@@ -449,7 +449,7 @@
 int unicode_to_glyphs(unsigned int *dst, unsigned int *char_to_glyph_pos,
                       int dst_size, unsigned int *src, int src_size, 
                       int reverse);
-void load_ligatures(void);
+int load_ligatures(void);
 
 /* qe event handling */
 

Index: unicode_join.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/unicode_join.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- unicode_join.c      12 Dec 2007 11:49:03 -0000      1.8
+++ unicode_join.c      18 Dec 2007 12:12:28 -0000      1.9
@@ -54,7 +54,7 @@
     return tab;
 }
 
-void load_ligatures(void)
+int load_ligatures(void)
 {
     FILE *f;
     char filename[MAX_FILENAME_SIZE];
@@ -62,11 +62,11 @@
     int long_count;
 
     if (find_resource_file(filename, sizeof(filename), "ligatures") < 0)
-        return;
+        return -1;
 
     f = fopen(filename, "r");
     if (!f)
-        return;
+        return -1;
     if (fread(sig, 1, 4, f) != 4 || memcmp(sig, "liga", 4) != 0)
         goto fail;
 
@@ -84,7 +84,7 @@
     if (!ligature_long)
         goto fail;
     fclose(f);
-    return;
+    return 0;
  fail:
     qe_free(&subst1);
     qe_free(&ligature2);
@@ -92,6 +92,7 @@
     subst1_count = 0;
     ligature2_count = 0;
     fclose(f);
+    return -1;
 }
 
 static int find_ligature(int l1, int l2)
@@ -313,7 +314,7 @@
 
 /* fallback unicode functions */
 
-void load_ligatures(void)
+int load_ligatures(void)
 {
 }