projects
/
YACASL2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
メモリ管理の改善
[YACASL2.git]
/
src
/
word.c
diff --git
a/src/word.c
b/src/word.c
index
3b30967
..
5f49cc4
100644
(file)
--- a/
src/word.c
+++ b/
src/word.c
@@
-1,11
+1,12
@@
#include "word.h"
/* wordのエラー定義 */
#include "word.h"
/* wordのエラー定義 */
-CERR
ARRAY
cerr_word[] = {
+CERR cerr_word[] = {
{ 114, "not integer" },
{ 115, "not hex" },
{ 116, "out of hex range" },
};
{ 114, "not integer" },
{ 115, "not hex" },
{ 116, "out of hex range" },
};
+
bool addcerrlist_word()
{
return addcerrlist(ARRAYSIZE(cerr_word), cerr_word);
bool addcerrlist_word()
{
return addcerrlist(ARRAYSIZE(cerr_word), cerr_word);
@@
-72,24
+73,33
@@
WORD nh2word(const char *str)
/* WORD値を10進数の文字列に変換 */
char *word2n(WORD word)
{
/* WORD値を10進数の文字列に変換 */
char *word2n(WORD word)
{
- char *p = malloc(6), *q = malloc(6);
+ enum {
+ MAXLEN = 6, /* WORD値を10進数で表したときの最大桁数 */
+ };
+ char *p = malloc_chk(MAXLEN, "word2n.p"), *digit = malloc_chk(MAXLEN, "word2n.digit");
int i = 0, j;
int i = 0, j;
+
do{
*(p + i++) = word % 10 + '0';
} while((word /= 10) > 0);
for(j = 0; j < i; j++) {
do{
*(p + i++) = word % 10 + '0';
} while((word /= 10) > 0);
for(j = 0; j < i; j++) {
- *(
q
+ j) = *(p + (i - 1) - j);
+ *(
digit
+ j) = *(p + (i - 1) - j);
}
}
- *(q + j + 1) = '\0';
- return q;
+ *(digit + j + 1) = '\0';
+ free_chk(p, "word2n.p");
+ return digit;
}
/* WORD値を2進数の文字列に変換 */
char *word2bit(const WORD word)
{
}
/* WORD値を2進数の文字列に変換 */
char *word2bit(const WORD word)
{
+ enum {
+ MAXLEN = 16, /* WORD値を2進数で表したときの最大桁数 */
+ };
WORD mask = 0x8000;
WORD mask = 0x8000;
- char *bit = malloc(16 + 1), *p;
- p = bit;
+ char *bit, *p;
+
+ bit = p = malloc_chk(MAXLEN + 1, "word2bit.bit");
do {
*p++ = (word & mask) ? '1' : '0';
} while((mask >>= 1) > 0);
do {
*p++ = (word & mask) ? '1' : '0';
} while((mask >>= 1) > 0);