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
/
cerr.c
diff --git
a/src/cerr.c
b/src/cerr.c
index
6b9ab40
..
116312b
100644
(file)
--- a/
src/cerr.c
+++ b/
src/cerr.c
@@
-10,7
+10,7
@@
*/
void cerr_init()
{
*/
void cerr_init()
{
- cerr = malloc_chk(sizeof(CERR
*
), "cerr");
+ cerr = malloc_chk(sizeof(CERR), "cerr");
cerr->num = 0;
}
cerr->num = 0;
}
@@
-30,14
+30,14
@@
CERRLIST *cerrlist = NULL;
void addcerrlist(int errc, CERR errv[])
{
int i;
void addcerrlist(int errc, CERR errv[])
{
int i;
- CERRLIST *p = NULL, *q = malloc_chk(sizeof(CERRLIST
*
), "cerrlist");
+ CERRLIST *p = NULL, *q = malloc_chk(sizeof(CERRLIST), "cerrlist");
assert(errc > 0 && errv != NULL);
for(i = 0; i < errc; i++) {
if(p == NULL) {
p = q;
} else {
assert(errc > 0 && errv != NULL);
for(i = 0; i < errc; i++) {
if(p == NULL) {
p = q;
} else {
- p = p->next = malloc_chk(sizeof(CERRLIST
*
), "cerrlist.next");
+ p = p->next = malloc_chk(sizeof(CERRLIST), "cerrlist.next");
}
p->cerr = &errv[i];
p->next = NULL;
}
p->cerr = &errv[i];
p->next = NULL;
@@
-71,7
+71,7
@@
void setcerr(int num, const char *str)
cerr->num = num;
/* 現在のエラーメッセージを設定 */
cerr->msg = malloc_chk(CERRMSGSIZE + 1, "cerr.msg");
cerr->num = num;
/* 現在のエラーメッセージを設定 */
cerr->msg = malloc_chk(CERRMSGSIZE + 1, "cerr.msg");
- if(
str != NULL
&& strlen(str) <= CERRSTRSIZE) {
+ if(
0 < strlen(str)
&& strlen(str) <= CERRSTRSIZE) {
sprintf(cerr->msg, "%s: %s", str, getcerrmsg(cerr->num));
} else {
strcpy(cerr->msg, getcerrmsg(cerr->num));
sprintf(cerr->msg, "%s: %s", str, getcerrmsg(cerr->num));
} else {
strcpy(cerr->msg, getcerrmsg(cerr->num));