X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/charset/blobdiff_plain/c6d25d8d73da77087aa3e413af2ae72f6300891f..HEAD:/sbcs.c

diff --git a/sbcs.c b/sbcs.c
index e15708c..e8be5a8 100644
--- a/sbcs.c
+++ b/sbcs.c
@@ -12,6 +12,11 @@
  * of the translation table.
  */
 
+long int sbcs_to_unicode(const struct sbcs_data *sd, long int input_chr)
+{
+    return sd->sbcs2ucs[input_chr];
+}
+
 void read_sbcs(charset_spec const *charset, long int input_chr,
 	       charset_state *state,
 	       void (*emit)(void *ctx, long int output), void *emitctx)
@@ -20,21 +25,13 @@ void read_sbcs(charset_spec const *charset, long int input_chr,
 
     UNUSEDARG(state);
 
-    emit(emitctx, sd->sbcs2ucs[input_chr]);
+    emit(emitctx, sbcs_to_unicode(sd, input_chr));
 }
 
-int write_sbcs(charset_spec const *charset, long int input_chr,
-	       charset_state *state,
-	       void (*emit)(void *ctx, long int output), void *emitctx)
+long int sbcs_from_unicode(const struct sbcs_data *sd, long int input_chr)
 {
-    const struct sbcs_data *sd = charset->data;
     int i, j, k, c;
 
-    UNUSEDARG(state);
-
-    if (input_chr == -1)
-	return TRUE;		       /* stateless; no cleanup required */
-
     /*
      * Binary-search in the ucs2sbcs table.
      */
@@ -43,14 +40,33 @@ int write_sbcs(charset_spec const *charset, long int input_chr,
     while (i+1 < j) {
 	k = (i+j)/2;
 	c = sd->ucs2sbcs[k];
-	if (input_chr < sd->sbcs2ucs[c])
+	if (input_chr < (long int)sd->sbcs2ucs[c])
 	    j = k;
-	else if (input_chr > sd->sbcs2ucs[c])
+	else if (input_chr > (long int)sd->sbcs2ucs[c])
 	    i = k;
 	else {
-	    emit(emitctx, c);
-	    return TRUE;
+	    return c;
 	}
     }
-    return FALSE;
+    return ERROR;
+}
+
+int write_sbcs(charset_spec const *charset, long int input_chr,
+	       charset_state *state,
+	       void (*emit)(void *ctx, long int output), void *emitctx)
+{
+    const struct sbcs_data *sd = charset->data;
+    long int ret;
+
+    UNUSEDARG(state);
+
+    if (input_chr == -1)
+	return TRUE;		       /* stateless; no cleanup required */
+
+    ret = sbcs_from_unicode(sd, input_chr);
+    if (ret == ERROR)
+	return FALSE;
+
+    emit(emitctx, ret);
+    return TRUE;
 }