X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=blobdiff_plain;f=src%2Fword.c;h=93717580ec69e9ac21e03c7dfd1028965c5de8c6;hp=3b309671470d78b0333ccaa4ed985808e7a67bb3;hb=4ee27a568fb9222907a566e59aaefe248f08a8e4;hpb=406fd6490ad76b4573b6ce9f8d322d92f13d27d8 diff --git a/src/word.c b/src/word.c index 3b30967..9371758 100644 --- a/src/word.c +++ b/src/word.c @@ -1,11 +1,12 @@ #include "word.h" /* wordのエラー定義 */ -CERRARRAY cerr_word[] = { +CERR cerr_word[] = { { 114, "not integer" }, { 115, "not hex" }, { 116, "out of hex range" }, }; + bool addcerrlist_word() { return addcerrlist(ARRAYSIZE(cerr_word), cerr_word); @@ -72,7 +73,7 @@ WORD nh2word(const char *str) /* WORD値を10進数の文字列に変換 */ char *word2n(WORD word) { - char *p = malloc(6), *q = malloc(6); + char *p = malloc_chk(6, "word2n.p"), *q = malloc_chk(6, "word2n.q"); int i = 0, j; do{ *(p + i++) = word % 10 + '0'; @@ -88,7 +89,7 @@ char *word2n(WORD word) char *word2bit(const WORD word) { WORD mask = 0x8000; - char *bit = malloc(16 + 1), *p; + char *bit = malloc_chk(16 + 1, "word2bit.bit"), *p; p = bit; do { *p++ = (word & mask) ? '1' : '0';