koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libi3: change scalloc() signature to match calloc()

Browse Source
This commit is contained in:
shdown
2015-08-03 12:50:13 +03:00
parent 05fb909636
commit bc52fae15c
32 changed files with 80 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/config_parser.c
View File

@ -414,7 +414,7 @@ struct ConfigResultIR *parse_config(const char *input, struct context *context)
}
}
if (walk != beginning) {
char *str = scalloc(walk - beginning + 1);
char *str = scalloc(walk - beginning + 1, 1);
/* We copy manually to handle escaping of characters. */
int inpos, outpos;
for (inpos = 0, outpos = 0;
@ -519,7 +519,7 @@ struct ConfigResultIR *parse_config(const char *input, struct context *context)
/* Contains the same amount of characters as 'input' has, but with
* the unparseable part highlighted using ^ characters. */
char *position = scalloc(strlen(error_line) + 1);
char *position = scalloc(strlen(error_line) + 1, 1);
const char *copywalk;
for (copywalk = error_line;
*copywalk != '\n' && *copywalk != '\r' && *copywalk != '\0';
@ -849,7 +849,7 @@ bool parse_file(const char *f, bool use_nagbar) {
if (fstat(fd, &stbuf) == -1)
die("Could not fstat file: %s\n", strerror(errno));
buf = scalloc((stbuf.st_size + 1) * sizeof(char));
buf = scalloc(stbuf.st_size + 1, 1);
if ((fstr = fdopen(fd, "r")) == NULL)
die("Could not fdopen: %s\n", strerror(errno));
@ -897,7 +897,7 @@ bool parse_file(const char *f, bool use_nagbar) {
while (*v_value == '\t' || *v_value == ' ')
v_value++;
struct Variable *new = scalloc(sizeof(struct Variable));
struct Variable *new = scalloc(1, sizeof(struct Variable));
new->key = sstrdup(v_key);
new->value = sstrdup(v_value);
SLIST_INSERT_HEAD(&variables, new, variables);
@ -990,7 +990,7 @@ bool parse_file(const char *f, bool use_nagbar) {
}
}
context = scalloc(sizeof(struct context));
context = scalloc(1, sizeof(struct context));
context->filename = f;
struct ConfigResultIR *config_output = parse_config(new, context);