~mdw
/
sgt
/
halibut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure (paragraph)->private_data is defined in all cases, on general
[sgt/halibut]
/
misc.c
diff --git
a/misc.c
b/misc.c
index
aa05878
..
a20c5b4
100644
(file)
--- a/
misc.c
+++ b/
misc.c
@@
-18,7
+18,7
@@
struct stackTag {
stack stk_new(void) {
stack s;
stack stk_new(void) {
stack s;
- s =
mk
new(struct stackTag);
+ s =
s
new(struct stackTag);
s->sp = 0;
s->size = 0;
s->data = NULL;
s->sp = 0;
s->size = 0;
s->data = NULL;
@@
-34,7
+34,7
@@
void stk_free(stack s) {
void stk_push(stack s, void *item) {
if (s->size <= s->sp) {
s->size = s->sp + 32;
void stk_push(stack s, void *item) {
if (s->size <= s->sp) {
s->size = s->sp + 32;
- s->data =
resize(s->data, s->size
);
+ s->data =
sresize(s->data, s->size, void *
);
}
s->data[s->sp++] = item;
}
}
s->data[s->sp++] = item;
}
@@
-62,7
+62,7
@@
const rdstringc empty_rdstringc = {0, 0, NULL};
void rdadd(rdstring *rs, wchar_t c) {
if (rs->pos >= rs->size-1) {
rs->size = rs->pos + 128;
void rdadd(rdstring *rs, wchar_t c) {
if (rs->pos >= rs->size-1) {
rs->size = rs->pos + 128;
- rs->text =
resize(rs->text, rs->size
);
+ rs->text =
sresize(rs->text, rs->size, wchar_t
);
}
rs->text[rs->pos++] = c;
rs->text[rs->pos] = 0;
}
rs->text[rs->pos++] = c;
rs->text[rs->pos] = 0;
@@
-71,20
+71,20
@@
void rdadds(rdstring *rs, wchar_t const *p) {
int len = ustrlen(p);
if (rs->pos >= rs->size - len) {
rs->size = rs->pos + len + 128;
int len = ustrlen(p);
if (rs->pos >= rs->size - len) {
rs->size = rs->pos + len + 128;
- rs->text =
resize(rs->text, rs->size
);
+ rs->text =
sresize(rs->text, rs->size, wchar_t
);
}
ustrcpy(rs->text + rs->pos, p);
rs->pos += len;
}
wchar_t *rdtrim(rdstring *rs) {
}
ustrcpy(rs->text + rs->pos, p);
rs->pos += len;
}
wchar_t *rdtrim(rdstring *rs) {
- rs->text =
resize(rs->text, rs->pos + 1
);
+ rs->text =
sresize(rs->text, rs->pos + 1, wchar_t
);
return rs->text;
}
void rdaddc(rdstringc *rs, char c) {
if (rs->pos >= rs->size-1) {
rs->size = rs->pos + 128;
return rs->text;
}
void rdaddc(rdstringc *rs, char c) {
if (rs->pos >= rs->size-1) {
rs->size = rs->pos + 128;
- rs->text =
resize(rs->text, rs->size
);
+ rs->text =
sresize(rs->text, rs->size, char
);
}
rs->text[rs->pos++] = c;
rs->text[rs->pos] = 0;
}
rs->text[rs->pos++] = c;
rs->text[rs->pos] = 0;
@@
-93,13
+93,13
@@
void rdaddsc(rdstringc *rs, char const *p) {
int len = strlen(p);
if (rs->pos >= rs->size - len) {
rs->size = rs->pos + len + 128;
int len = strlen(p);
if (rs->pos >= rs->size - len) {
rs->size = rs->pos + len + 128;
- rs->text =
resize(rs->text, rs->size
);
+ rs->text =
sresize(rs->text, rs->size, char
);
}
strcpy(rs->text + rs->pos, p);
rs->pos += len;
}
char *rdtrimc(rdstringc *rs) {
}
strcpy(rs->text + rs->pos, p);
rs->pos += len;
}
char *rdtrimc(rdstringc *rs) {
- rs->text =
resize(rs->text, rs->pos + 1
);
+ rs->text =
sresize(rs->text, rs->pos + 1, char
);
return rs->text;
}
return rs->text;
}
@@
-126,7
+126,7
@@
static int compare_wordlists_literally(word *a, word *b) {
} else {
wchar_t *ap = a->text, *bp = b->text;
while (*ap && *bp) {
} else {
wchar_t *ap = a->text, *bp = b->text;
while (*ap && *bp) {
- wchar_t ac =
utolower(*ap), bc = utolower(*bp)
;
+ wchar_t ac =
*ap, bc = *bp
;
if (ac != bc)
return (ac < bc ? -1 : +1);
if (!*++ap && a->next && a->next->type == t && !a->next->alt)
if (ac != bc)
return (ac < bc ? -1 : +1);
if (!*++ap && a->next && a->next->type == t && !a->next->alt)
@@
-462,7
+462,7
@@
wrappedline *wrap_para(word *text, int width, int subsequentwidth,
*/
i = 0;
while (i < nwords) {
*/
i = 0;
while (i < nwords) {
- wrappedline *w =
mk
new(wrappedline);
+ wrappedline *w =
s
new(wrappedline);
*ptr = w;
ptr = &w->next;
w->next = NULL;
*ptr = w;
ptr = &w->next;
w->next = NULL;
@@
-515,13
+515,13
@@
void cmdline_cfg_add(paragraph *cfg, char *string)
upos = ulen;
ulen += 2 + ustrlen(ustring);
upos = ulen;
ulen += 2 + ustrlen(ustring);
- cfg->keyword =
resize(cfg->keyword, ulen
);
+ cfg->keyword =
sresize(cfg->keyword, ulen, wchar_t
);
ustrcpy(cfg->keyword+upos, ustring);
cfg->keyword[ulen-1] = L'\0';
pos = len;
len += 2 + strlen(string);
ustrcpy(cfg->keyword+upos, ustring);
cfg->keyword[ulen-1] = L'\0';
pos = len;
len += 2 + strlen(string);
- cfg->origkeyword =
resize(cfg->origkeyword, len
);
+ cfg->origkeyword =
sresize(cfg->origkeyword, len, char
);
strcpy(cfg->origkeyword+pos, string);
cfg->origkeyword[len-1] = '\0';
strcpy(cfg->origkeyword+pos, string);
cfg->origkeyword[len-1] = '\0';
@@
-532,7
+532,7
@@
paragraph *cmdline_cfg_new(void)
{
paragraph *p;
{
paragraph *p;
- p =
mk
new(paragraph);
+ p =
s
new(paragraph);
memset(p, 0, sizeof(*p));
p->type = para_Config;
p->next = NULL;
memset(p, 0, sizeof(*p));
p->type = para_Config;
p->next = NULL;