linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- simplified errormsg interface

Browse Source
This commit is contained in:
zolliker
2008-06-13 11:15:14 +00:00
parent 657afffe9c
commit 0305826724
4 changed files with 34 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
errormsg.c
View File

@@ -18,80 +18,42 @@ int ErrEqual(char *str1, char *str2) {
if (str1 == NULL || str2 == NULL) {
return str1 == str2;
}
str1++;
str2++;
} else {
str1++;
str2++;
}
str1++;
str2++;
}
return 1;
}
ErrMsg *ErrFind(ErrMsg *dump, char *message){
ErrMsg *cur = dump;
while(cur != NULL){
if(ErrEqual(message,cur->text)){
break;
}
cur = cur->next;
}
return cur;
}
ErrMsg *ErrPutMsg(ErrMsg *dump, ErrMsg **current, char *fmt, ...){
ErrMsg *m = NULL;
va_list ap;
char buf[1024];
/* format message */
va_start(ap, fmt);
memset(buf,0,1024*sizeof(char));
vsnprintf(buf, sizeof buf, fmt, ap);
va_end(ap);
m = ErrFind(dump, buf);
if(m == NULL){
m = calloc(1, sizeof(*m));
m->text = strdup(buf);
m->cnt = 1;
m->next = dump;
*current = m;
return m;
} else {
*current = m;
return dump;
}
}
ErrMsg *ErrOldPutMsg(ErrMsg *dump, char *fmt, ...) {
ErrMsg *m = NULL;
ErrMsg **last = NULL;
va_list ap;
char buf[256];
char *text = NULL;
int l;
va_start(ap, fmt);
l = vsnprintf(buf, sizeof buf, fmt, ap);
va_end(ap);
if (l < sizeof buf) {
text = buf;
} else {
/* assuming we have a C99 conforming snprintf and need a larger buffer */
text = calloc(l, 1);
va_start(ap, fmt);
vsnprintf(text, l, fmt, ap);
va_end(ap);
}
for (last = &dump; *last != NULL; last = &m->next) {
m = *last;
ErrMsg *ErrPutMsg(ErrMsg *dump, char *fmt, ...) {
ErrMsg *m = NULL;
ErrMsg **last = NULL;
va_list ap;
char buf[256];
char *text = NULL;
int l;
va_start(ap, fmt);
l = vsnprintf(buf, sizeof buf, fmt, ap);
va_end(ap);
if (l < sizeof buf) {
text = buf;
} else {
/* assuming we have a C99 conforming snprintf and need a larger buffer */
text = calloc(l, 1);
va_start(ap, fmt);
vsnprintf(text, l, fmt, ap);
va_end(ap);
}
last = &dump;
for (m = dump; m != NULL; m = m->next) {
if (ErrEqual(text, m->text)) {
*last = m->next;
*last = m->next; /* remove found item from list */
break;
}
last = &m->next;
}
if (m == NULL) {
if (m == NULL) { /* make a new item */
if (text == buf) text = strdup(buf);
m = calloc(1, sizeof(*m));
m->text = text;
@@ -100,9 +62,7 @@ ErrMsg *ErrOldPutMsg(ErrMsg *dump, char *fmt, ...) {
if (text != buf) free(text);
m->cnt++;
}
if(m != dump){
m->next = dump;
}
m->next = dump;
time(&m->last);
return m;
}