Rename to Sj4

src/sj4mkdic/char.c

@@ -34,9 +34,9 @@
  */
 
 #include "sj_euc.h"
-#include "sj3_dict_const.h"
+#include "sj4_dict_const.h"
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 int cnvyomi(int code) {
 	u_short hh;

src/sj4mkdic/cnvhinsi.c

@@ -33,7 +33,7 @@
  * $SonyDate: 1996/05/27 06:59:47 $
  */
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 static struct gram_code {
 	char* name;

src/sj4mkdic/file.c

@@ -33,7 +33,7 @@
  * $SonyDate: 1995/02/03 07:38:32 $
  */
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 typedef struct filelist {
 	FILE*		 fp;

src/sj4mkdic/global.c

@@ -33,9 +33,9 @@
  * $SonyDate: 1994/06/03 08:00:35 $
  */
 
-#include "sj3_dict_struct.h"
+#include "sj4_dict_struct.h"
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 DouonRec* douon_ptr = NULL;
 int	  douon_num = 0;

src/sj4mkdic/hindo.c

@@ -33,9 +33,9 @@
  * $SonyDate: 1994/08/17 01:50:26 $
  */
 
-#include "sj3_dict_struct.h"
+#include "sj4_dict_struct.h"
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 int check_hindo(u_char* ptr, int len) {
 	int low, high, mid;

src/sj4mkdic/knjcvt.c

@@ -33,10 +33,10 @@
  * $SonyDate: 1994/06/03 08:00:37 $
  */
 
-#include "sj3_dict_const.h"
-#include "sj3_dict_struct.h"
+#include "sj4_dict_const.h"
+#include "sj4_dict_struct.h"
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 typedef struct div_list {
 	int		 len;

src/sj4mkdic/makedict.c

@@ -33,9 +33,9 @@
  * $SonyDate: 1994/12/09 11:27:05 $
  */
 
-#include "sj3_dict_const.h"
+#include "sj4_dict_const.h"
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 FILE* infp  = NULL;
 FILE* outfp = NULL;

src/sj4mkdic/makelist.c

@@ -33,9 +33,9 @@
  * $SonyDate: 1994/06/03 08:00:39 $
  */
 
-#include "sj3_dict_struct.h"
+#include "sj4_dict_struct.h"
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 #ifndef SS2
 #define SS2 0x8e

src/sj4mkdic/makeseg.c

@@ -33,10 +33,10 @@
  * $SonyDate: 1994/12/09 11:27:05 $
  */
 
-#include "sj3_dict_struct.h"
+#include "sj4_dict_struct.h"
 #include "Dict.h"
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 static u_char mindex[MAINSEGMENTLENGTH];
 static int    idxpos = 0;

src/sj4mkdic/memory.c

@@ -33,7 +33,7 @@
  * $SonyDate: 1994/06/03 08:00:42 $
  */
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 void* Malloc(unsigned size) {
 	void* p;

src/sj4mkdic/offset.c

@@ -33,9 +33,9 @@
  * $SonyDate: 1994/08/17 01:50:26 $
  */
 
-#include "sj3_dict_struct.h"
+#include "sj4_dict_struct.h"
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 static OffsetRec*
 makeoffset(u_char* ptr, int len, int ofs) {

src/sj4mkdic/readline.c

@@ -34,9 +34,9 @@
  */
 
 #include "sj_euc.h"
-#include "sj3_dict_const.h"
+#include "sj4_dict_const.h"
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 static int yomi[MAXYOMILENGTH + 1];
 static int kanji[MAXKANJILENGTH + 1];

src/sj4mkdic/sj4_dict_const.h

@@ -28,13 +28,13 @@
  */
 
 /*
- * $SonyRCSfile: sj3_dict_const.h,v $
+ * $SonyRCSfile: sj4_dict_const.h,v $
  * $SonyRevision: 1.1 $
  * $SonyDate: 1994/06/03 08:00:24 $
  */
 
-#ifndef SJ3_DICT_CONST_H
-#define SJ3_DICT_CONST_H
+#ifndef SJ4_DICT_CONST_H
+#define SJ4_DICT_CONST_H
 
 #define MAINSEGMENTLENGTH 2048
 #define MAININDEXLENGTH 2048

src/sj4mkdic/sj4_dict_struct.h

@@ -28,15 +28,15 @@
  */
 
 /*
- * $SonyRCSfile: sj3_dict_struct.h,v $
+ * $SonyRCSfile: sj4_dict_struct.h,v $
  * $SonyRevision: 1.1 $
  * $SonyDate: 1994/06/03 08:00:26 $
  */
 
-#include "sj3_dict_const.h"
+#include "sj4_dict_const.h"
 
-#ifndef SJ3_DICT_STRUCT_H
-#define SJ3_DICT_STRUCT_H
+#ifndef SJ4_DICT_STRUCT_H
+#define SJ4_DICT_STRUCT_H
 
 #include <sj_typedef.h>
 

src/sj4mkdic/sj4mkdic.h

@@ -14,8 +14,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef SJ3MKDIC_H
-#define SJ3MKDIC_H
+#ifndef SJ4MKDIC_H
+#define SJ4MKDIC_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "sj3_dict_struct.h"
+#include "sj4_dict_struct.h"
 
 /* char.c */
 int  cnvyomi(int);
@@ -126,4 +126,4 @@ int  string_cmp(u_char*, int, u_char*, int);
 void utf8_print(char*, int);
 int  unicode_to_eucjp(int utf);
 
-#endif /* SJ3MKDIC_H */
+#endif /* SJ4MKDIC_H */

src/sj4mkdic/string.c

@@ -33,9 +33,9 @@
  * $SonyDate: 1994/06/03 08:00:45 $
  */
 
-#include "sj3_dict_const.h"
+#include "sj4_dict_const.h"
 
-#include "sj3mkdic.h"
+#include "sj4mkdic.h"
 
 #include "ucstable.h"
 

src/sj4test/main.c

@@ -5,7 +5,12 @@ int main(int argc, char** argv) {
 	int	    i = 0;
 	char	    c[64 * 1024];
 	char	    b;
-	Sj3Context* ctx = alloccontext("dic.bin");
+	Sj4Context* ctx = alloccontext("dic.bin");
+
+	if(ctx == NULL){
+		fprintf(stderr, "Failed to create context\n");
+		return 1;
+	}
 
 	c[0] = 0;