More uses of uint16_t instead of short

diff --git a/src/catdoc.h b/src/catdoc.h
index 9f64c86105dd4603fc710221ff09e8c3416f7ecd..bd8e52b92a0ee2a5866bab14cd78a07fd3cfc7c8 100644 (file)
--- a/src/catdoc.h
+++ b/src/catdoc.h
@@ -168,14 +168,14 @@ extern  int wrap_margin;
 /* Structure to store UNICODE -> target charset mappings */
 /* array of 256 pointers (which may be null) to arrays of 256 short ints
    which contain 8-bit character codes or -1 if no matching char */
 /* Structure to store UNICODE -> target charset mappings */
 /* array of 256 pointers (which may be null) to arrays of 256 short ints
    which contain 8-bit character codes or -1 if no matching char */

-typedef short int  ** CHARSET;
+typedef int16_t  ** CHARSET;

 
 /* structure to store multicharacter substitution mapping */
 /* Array of 256 pointers to arrays of 256 pointers to string */
 /* configuration variables defined in catdoc.c */
 typedef char *** SUBSTMAP;
 
 
 /* structure to store multicharacter substitution mapping */
 /* Array of 256 pointers to arrays of 256 pointers to string */
 /* configuration variables defined in catdoc.c */
 typedef char *** SUBSTMAP;
 

-extern short int *source_charset;
+extern uint16_t *source_charset;

 extern char bad_char[]; /* defines one-symbol string to replace unknown unicode chars */
 extern char *source_csname;
 extern char *dest_csname;
 extern char bad_char[]; /* defines one-symbol string to replace unknown unicode chars */
 extern char *source_csname;
 extern char *dest_csname;

diff --git a/src/charsets.c b/src/charsets.c
index a81ceebe1a1bb6f8f7e1d38a1379a8c85e7fac77..49875e3b4f27f4251d4778fefed382ed135040be 100644 (file)
--- a/src/charsets.c
+++ b/src/charsets.c
@@ -14,7 +14,7 @@
 
 char *charset_path=CHARSETPATH;
 char *source_csname=SOURCE_CHARSET, *dest_csname=TARGET_CHARSET;
 
 char *charset_path=CHARSETPATH;
 char *source_csname=SOURCE_CHARSET, *dest_csname=TARGET_CHARSET;

-short int * source_charset;
+uint16_t * source_charset;

 int unknown_as_hex=0;
 char bad_char[]=UNKNOWN_CHAR;
 CHARSET target_charset;
 int unknown_as_hex=0;
 char bad_char[]=UNKNOWN_CHAR;
 CHARSET target_charset;