summaryrefslogtreecommitdiff
path: root/source3/lib/kanji.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-10-04 01:03:23 +0000
committerJeremy Allison <jra@samba.org>2000-10-04 01:03:23 +0000
commit23f78fd7b91878176c518471cdca84cad826cba9 (patch)
tree477d465d5b415d25789c9d53153c9d4a636c2b96 /source3/lib/kanji.c
parent6692d0905e3e8605884ced5d38efb26929648d29 (diff)
downloadsamba-23f78fd7b91878176c518471cdca84cad826cba9.tar.gz
samba-23f78fd7b91878176c518471cdca84cad826cba9.tar.bz2
samba-23f78fd7b91878176c518471cdca84cad826cba9.zip
Adding Herb's compile warning fixes to HEAD.
Jeremy. (This used to be commit d131ad1ce3f6e72e295f865a463f8dcbfa6f8d42)
Diffstat (limited to 'source3/lib/kanji.c')
-rw-r--r--source3/lib/kanji.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/kanji.c b/source3/lib/kanji.c
index fe65f98b58..ca81933a19 100644
--- a/source3/lib/kanji.c
+++ b/source3/lib/kanji.c
@@ -422,11 +422,11 @@ static int euc2sjis (int hi, int lo)
static int sjis2euc (int hi, int lo)
{
int minidx = 0;
- int maxidx = SJISCONVTBLSIZ;
+ int maxidx = SJISCONVTBLSIZ -1; /* max index 1 less than number of entries */
int i = ( 0 + SJISCONVTBLSIZ ) % 2;
int w = (int)((hi << 8) | lo);
- if ( (sjisconv[0].start < w) && (w < sjisconv[SJISCONVTBLSIZ].end) ) {
+ if ( (sjisconv[0].start < w) && (w < sjisconv[SJISCONVTBLSIZ-1].end) ) {
while (maxidx >= minidx) {
if ( sjisconv[i].start > w ) {
maxidx = i-1;
@@ -778,11 +778,11 @@ static char *euc3_to_sj(char *from, BOOL overwrite)
static int sjis2jis(int hi, int lo)
{
int minidx = 0;
- int maxidx = SJISCONVTBLSIZ;
+ int maxidx = SJISCONVTBLSIZ -1; /* max index 1 less than number of entries */
int i = (0 + SJISCONVTBLSIZ) % 2;
int w = (int)((hi << 8) | lo);
- if ((sjisconv[0].start < w) && (w < sjisconv[SJISCONVTBLSIZ].end)) {
+ if ((sjisconv[0].start < w) && (w < sjisconv[SJISCONVTBLSIZ-1].end)) {
while (maxidx >= minidx) {
if (sjisconv[i].start > w) {
maxidx = i-1;