From 69e68e6b8d2f38a4c5b896ebd42eb1d866b2087d Mon Sep 17 00:00:00 2001 From: Victor Wagner Date: Tue, 26 Apr 2016 11:47:42 +0300 Subject: [PATCH] More uses of uint16_t instead of short --- src/catdoc.h | 4 ++-- src/charsets.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/catdoc.h b/src/catdoc.h index 9f64c86..bd8e52b 100644 --- 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 */ -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; -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; diff --git a/src/charsets.c b/src/charsets.c index a81ceeb..49875e3 100644 --- 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; -short int * source_charset; +uint16_t * source_charset; int unknown_as_hex=0; char bad_char[]=UNKNOWN_CHAR; CHARSET target_charset; -- 2.39.2