X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fword.c;h=bb564cfd8b0f10dce4c35a7a98b7f9ed0fdb1d05;hb=e0b43c278256919e3bacf9b925e9cec04fa93835;hp=e11b73017a7858a4718ecdf63181e795c33234cc;hpb=a7982d41c9809fdddbc5bac27c9d08b8a9d05012;p=YACASL2.git diff --git a/src/word.c b/src/word.c index e11b730..bb564cf 100644 --- a/src/word.c +++ b/src/word.c @@ -29,7 +29,7 @@ WORD n2word(const char *str) { assert(isdigit(str[0]) || str[0] == '-'); - char *check; + char *check = NULL; int n; /* WORD値に変換 */ n = strtol(str, &check, 10); @@ -48,8 +48,8 @@ WORD h2word(const char *str) { assert(str[0] == '#'); - WORD w = 0x0; - char *check; + WORD w = 0; + char *check = NULL; str++; if(*str == '-' || strlen(str) > 4) { setcerr(116, str-1); /* out of hex range */ @@ -140,9 +140,10 @@ char *word2bit(const WORD word) MAXLEN = 16, /* WORD値を2進数で表したときの最大桁数 */ }; WORD mask = 0x8000; - char *bit = malloc_chk(MAXLEN + 1, "word2bit.bit"); + char *bit = NULL; int i = 0; + bit = malloc_chk(MAXLEN + 1, "word2bit.bit"); do { bit[i++] = (word & mask) ? '1' : '0'; } while((mask >>= 1) > 0);