[FriBidi-commit]
fribidi ChangeLog, 1.60.2.18, 1.60.2.19 Makefile.am,
1.30.2.12, 1.30.2.13 fribidi.c, 1.33.2.10, 1.33.2.11 fribidi.h,
1.15.2.8, 1.15.2.9 fribidi_benchmark.c, 1.16.2.2,
1.16.2.3 fribidi_bidi_types.c, 1.1.2.1,
1.1.2.2 fribidi_create_char_types.c, 1.7.2.5,
1.7.2.6 fribidi_create_mirroring.c, 1.7.2.3,
1.7.2.4 fribidi_mem.c, 1.3.2.4, 1.3.2.5 fribidi_mem.h, 1.2.2.6,
1.2.2.7 fribidi_types.h, 1.16.2.5, 1.16.2.6 packtab.c, 1.4.2.4,
1.4.2.5 packtab.h, 1.2.2.2, 1.2.2.3
Behdad Esfahbod
behdad at freedesktop.org
Sun Sep 25 11:58:37 PDT 2005
Update of /cvs/fribidi/fribidi
In directory gabe:/tmp/cvs-serv13461
Modified Files:
Tag: STABLE
ChangeLog Makefile.am fribidi.c fribidi.h fribidi_benchmark.c
fribidi_bidi_types.c fribidi_create_char_types.c
fribidi_create_mirroring.c fribidi_mem.c fribidi_mem.h
fribidi_types.h packtab.c packtab.h
Log Message:
Const added in places.
Index: ChangeLog
===================================================================
RCS file: /cvs/fribidi/fribidi/ChangeLog,v
retrieving revision 1.60.2.18
retrieving revision 1.60.2.19
diff -u -d -r1.60.2.18 -r1.60.2.19
--- ChangeLog 25 Sep 2005 18:38:36 -0000 1.60.2.18
+++ ChangeLog 25 Sep 2005 18:58:35 -0000 1.60.2.19
@@ -5,6 +5,7 @@
fribidi2 tree, and voodoo to make it all work.
* acconfig.h, acinclude.m4, stamp-h.in: Removed, you generated
bastards!
+ * *: const added in places.
2005-06-08 Behdad Esfahbod <fribidi at behdad.org>
* NEWS, README, AUTHORS, THANKS: Updated.
Index: Makefile.am
===================================================================
RCS file: /cvs/fribidi/fribidi/Makefile.am,v
retrieving revision 1.30.2.12
retrieving revision 1.30.2.13
diff -u -d -r1.30.2.12 -r1.30.2.13
--- Makefile.am 25 Sep 2005 18:38:36 -0000 1.30.2.12
+++ Makefile.am 25 Sep 2005 18:58:35 -0000 1.30.2.13
@@ -147,7 +147,7 @@
if test -d unidata; then UNIDATA=unidata; \
else UNIDATA="$(srcdir)/unidata"; fi && \
./fribidi_create_char_types "`echo "$@" \
- | $(SED) 's/[^0-9]*//g'`" "$$UNIDATA" || \
+ | sed 's/[^0-9]*//g'`" "$$UNIDATA" || \
($(RM) "$@"; false)
$(RM) fribidi_tab_char_type_stamp
$(MAKE) fribidi_tab_char_type_stamp
@@ -178,14 +178,14 @@
$(MAKE) fribidi
(test -d tests || mkdir tests) && \
testcase="$@" && \
- charset="`echo "$@" | $(SED) 's/_[^_]*$$//;s/.*_//'`" && \
+ charset="`echo "$@" | sed 's/_[^_]*$$//;s/.*_//'`" && \
./fribidi --test --charset "$$charset" "$<" > "$@" || \
($(RM) "$@"; false)
test.reference:
for testcase in "$(srcdir)"/tests/test_*.input; do \
test="`echo "$$testcase" \
- | $(SED) 's/\.input$$/.reference/i; s|.*/||;'`" && \
+ | sed 's/\.input$$/.reference/i; s|.*/||;'`" && \
$(MAKE) "tests/$$test" || \
exit 1; \
done
Index: fribidi.c
===================================================================
RCS file: /cvs/fribidi/fribidi/fribidi.c,v
retrieving revision 1.33.2.10
retrieving revision 1.33.2.11
diff -u -d -r1.33.2.10 -r1.33.2.11
--- fribidi.c 7 Jun 2005 13:37:31 -0000 1.33.2.10
+++ fribidi.c 25 Sep 2005 18:58:35 -0000 1.33.2.11
@@ -89,10 +89,11 @@
fribidi_set_debug (fribidi_boolean debug)
{
#ifdef DEBUG
- return fribidi_debug = debug;
+ fribidi_debug = debug;
#else
- return 0;
+ debug = 0;
#endif
+ return debug;
}
static void
Index: fribidi.h
===================================================================
RCS file: /cvs/fribidi/fribidi/fribidi.h,v
retrieving revision 1.15.2.8
retrieving revision 1.15.2.9
diff -u -d -r1.15.2.8 -r1.15.2.9
--- fribidi.h 7 Aug 2002 12:02:56 -0000 1.15.2.8
+++ fribidi.h 25 Sep 2005 18:58:35 -0000 1.15.2.9
@@ -93,16 +93,6 @@
FriBidiCharType *type);
/*======================================================================
- * fribidi_get_mirror_char() returns the mirrored character, if any.
- *----------------------------------------------------------------------*/
- FRIBIDI_API fribidi_boolean fribidi_get_mirror_char (
- /* Input */
- FriBidiChar ch,
- /* Output */
- FriBidiChar
- *mirrored_ch);
-
-/*======================================================================
* fribidi_get_mirror_char() returns the mirrored character, if input
* character has a mirror, or the input itself.
* if mirrored_ch is NULL, just returns if character has a mirror or not.
Index: fribidi_benchmark.c
===================================================================
RCS file: /cvs/fribidi/fribidi/fribidi_benchmark.c,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -d -r1.16.2.2 -r1.16.2.3
--- fribidi_benchmark.c 7 Jun 2005 13:37:31 -0000 1.16.2.2
+++ fribidi_benchmark.c 25 Sep 2005 18:58:35 -0000 1.16.2.3
@@ -40,7 +40,7 @@
#define MAX_STR_LEN 1000
static void
-die (char *fmt, ...)
+die (const char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
Index: fribidi_bidi_types.c
===================================================================
RCS file: /cvs/fribidi/fribidi/Attic/fribidi_bidi_types.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- fribidi_bidi_types.c 7 Jun 2005 13:39:51 -0000 1.1.2.1
+++ fribidi_bidi_types.c 25 Sep 2005 18:58:35 -0000 1.1.2.2
@@ -2,7 +2,7 @@
#include <fribidi.h>
int
-main ()
+main (void)
{
FriBidiChar c;
Index: fribidi_create_char_types.c
===================================================================
RCS file: /cvs/fribidi/fribidi/fribidi_create_char_types.c,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -d -r1.7.2.5 -r1.7.2.6
--- fribidi_create_char_types.c 7 Jun 2005 13:37:31 -0000 1.7.2.5
+++ fribidi_create_char_types.c 25 Sep 2005 18:58:35 -0000 1.7.2.6
@@ -33,14 +33,14 @@
#endif
static void
-err (char *msg)
+err (const char *msg)
{
fprintf (stderr, "fribidi_create_char_types: %s\n", msg);
exit (1);
}
static void
-err2 (char *fmt, char *p)
+err2 (const char *fmt, const char *p)
{
fprintf (stderr, "fribidi_create_char_types: ");
fprintf (stderr, fmt, p);
@@ -51,7 +51,7 @@
/* *INDENT-OFF* */
struct
{
- char *name;
+ const char *name;
int key;
}
type_names[] =
@@ -85,7 +85,7 @@
static char *unidata_file;
static char
-get_type (char *s)
+get_type (const char *s)
{
int i;
@@ -109,7 +109,7 @@
static int table[FRIBIDI_UNICODE_CHARS];
static void
-init_table ()
+init_table (void)
{
int i;
register FriBidiChar c;
@@ -161,7 +161,7 @@
}
static void
-read_unicode_data ()
+read_unicode_data (void)
{
char s[500], tp[10];
unsigned int i;
@@ -179,7 +179,7 @@
}
static char *
-headermacro (char *file)
+headermacro (const char *file)
{
char *t = strdup (file);
char *p = t;
@@ -195,7 +195,7 @@
}
static void
-write_char_type (char *file, int max_depth)
+write_char_type (const char *file, int max_depth)
{
int i;
FILE *f;
Index: fribidi_create_mirroring.c
===================================================================
RCS file: /cvs/fribidi/fribidi/fribidi_create_mirroring.c,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -d -r1.7.2.3 -r1.7.2.4
--- fribidi_create_mirroring.c 7 Jun 2005 13:37:31 -0000 1.7.2.3
+++ fribidi_create_mirroring.c 25 Sep 2005 18:58:35 -0000 1.7.2.4
@@ -28,7 +28,7 @@
#include "fribidi_unicode.h"
static void
-err2 (char *fmt, char *p)
+err2 (const char *fmt, char *p)
{
fprintf (stderr, "fribidi_create_mirroring: error: ");
fprintf (stderr, fmt, p);
@@ -42,7 +42,7 @@
static int mirroring_count;
static void
-read_bidi_mirroring ()
+read_bidi_mirroring (void)
{
char s[500];
unsigned int i, j;
@@ -130,7 +130,7 @@
int
main (int argc, char **argv)
{
- char *p;
+ const char *p;
p = (argc >= 2) ? argv[1] : "unidata";
bidi_mirroring_file = malloc (50 + strlen (p));
Index: fribidi_mem.c
===================================================================
RCS file: /cvs/fribidi/fribidi/fribidi_mem.c,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -d -r1.3.2.4 -r1.3.2.5
--- fribidi_mem.c 7 Jun 2005 13:37:31 -0000 1.3.2.4
+++ fribidi_mem.c 25 Sep 2005 18:58:35 -0000 1.3.2.5
@@ -25,7 +25,7 @@
struct _FriBidiMemChunk
{
- char *name;
+ const char *name;
int atom_size;
int area_size;
int type;
@@ -54,7 +54,7 @@
}
FriBidiMemChunk *
-fribidi_mem_chunk_new (char *name,
+fribidi_mem_chunk_new (const char *name,
int atom_size, unsigned long area_size, int type)
{
FriBidiMemChunk *m = (FriBidiMemChunk *) malloc (sizeof (FriBidiMemChunk));
Index: fribidi_mem.h
===================================================================
RCS file: /cvs/fribidi/fribidi/fribidi_mem.h,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -d -r1.2.2.6 -r1.2.2.7
--- fribidi_mem.h 7 Jun 2005 13:37:31 -0000 1.2.2.6
+++ fribidi_mem.h 25 Sep 2005 18:58:35 -0000 1.2.2.7
@@ -37,7 +37,7 @@
#define FRIBIDI_ALLOC_ONLY 1
#define FRIBIDI_ALLOC_AND_FREE 2
- FriBidiMemChunk *fribidi_mem_chunk_new (char *name,
+ FriBidiMemChunk *fribidi_mem_chunk_new (const char *name,
int atom_size,
unsigned long area_size, int type);
void fribidi_mem_chunk_destroy (FriBidiMemChunk *mem_chunk);
Index: fribidi_types.h
===================================================================
RCS file: /cvs/fribidi/fribidi/fribidi_types.h,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -d -r1.16.2.5 -r1.16.2.6
--- fribidi_types.h 7 Jun 2005 13:37:31 -0000 1.16.2.5
+++ fribidi_types.h 25 Sep 2005 18:58:35 -0000 1.16.2.6
@@ -69,9 +69,10 @@
};
#ifndef FRIBIDI_MAX_STRING_LENGTH
-#define FRIBIDI_MAX_STRING_LENGTH (sizeof (FriBidiStrIndex) == 2 ? \
+#define FRIBIDI_MAX_STRING_LENGTH (FriBidiStrIndex) \
+ (sizeof (FriBidiStrIndex) == 2 ? \
0x7FFE : (sizeof (FriBidiStrIndex) == 1 ? \
- 0x7E : 0x8FFFFFFEL))
+ 0x7E : 0x7FFFFFFEL))
#endif
Index: packtab.c
===================================================================
RCS file: /cvs/fribidi/fribidi/packtab.c,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -d -r1.4.2.4 -r1.4.2.5
--- packtab.c 4 Aug 2002 19:43:29 -0000 1.4.2.4
+++ packtab.c 25 Sep 2005 18:58:35 -0000 1.4.2.5
@@ -34,7 +34,7 @@
static int n, a, max_depth, N, digits, tab_width, per_row;
static uni_table temp, x, perm, *tab;
static int pow[22], cluster, cmpcluster;
-static char **name, *key_type_name, *table_name, *macro_name;
+static const char * const *name, *key_type_name, *table_name, *macro_name;
static FILE *f;
static void
@@ -292,7 +292,7 @@
}
static void
-write_out ()
+write_out (void)
{
int i;
fprintf (f, "/*\n"
@@ -319,10 +319,10 @@
int key_size,
int p_max_depth,
int p_tab_width,
- char **p_name,
- char *p_key_type_name,
- char *p_table_name,
- char *p_macro_name,
+ const char * const *p_name,
+ const char *p_key_type_name,
+ const char *p_table_name,
+ const char *p_macro_name,
FILE * out)
{
N = key_num;
Index: packtab.h
===================================================================
RCS file: /cvs/fribidi/fribidi/packtab.h,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- packtab.h 4 Aug 2002 19:43:29 -0000 1.2.2.2
+++ packtab.h 25 Sep 2005 18:58:35 -0000 1.2.2.3
@@ -34,10 +34,10 @@
int key_size,
int max_depth,
int tab_width,
- char **name,
- char *key_type_name,
- char *table_name,
- char *macro_name,
+ const char * const *name,
+ const char *key_type_name,
+ const char *table_name,
+ const char *macro_name,
FILE * out);
#ifdef __cplusplus
More information about the fribidi-commit
mailing list