Commit 50880db2c554ad73d5524ef21d376fab25129a5d - i3-gaps

Reduce some code around frees Orestis Floros 5 years ago

7 changed file(s) with 8 addition(s) and 15 deletion(s). Raw diff Collapse all Expand all

-1

i3-config-wizard/main.c less more

215	215
216	216	static void clear_stack(void) {
217	217	for (int c = 0; c < 10; c++) {
218		if (stack[c].type == STACK_STR && stack[c].val.str != NULL)
	218	if (stack[c].type == STACK_STR)
219	219	free(stack[c].val.str);
220	220	stack[c].identifier = NULL;
221	221	stack[c].val.str = NULL;

-3

libi3/dpi.c less more

53	53	DLOG("Found Xft.dpi = %ld.\n", dpi);
54	54
55	55	init_dpi_end:
56		if (resource != NULL) {
57		free(resource);
58		}
	56	free(resource);
59	57
60	58	if (database != NULL) {
61	59	xcb_xrm_database_free(database);

-5

libi3/font.c less more

223	223	error->error_code);
224	224	}
225	225	}
226		if (error != NULL) {
227		free(error);
228		}
	226	free(error);
229	227
230	228	font.pattern = sstrdup(pattern);
231	229	LOG("Using X font %s\n", pattern);

274	272	case FONT_TYPE_XCB: {
275	273	/* Close the font and free the info */
276	274	xcb_close_font(conn, savedFont->specific.xcb.id);
277		if (savedFont->specific.xcb.info)
278		free(savedFont->specific.xcb.info);
	275	free(savedFont->specific.xcb.info);
279	276	break;
280	277	}
281	278	case FONT_TYPE_PANGO:

-1

src/commands_parser.c less more

156	156	// TODO move to a common util
157	157	static void clear_stack(void) {
158	158	for (int c = 0; c < 10; c++) {
159		if (stack[c].type == STACK_STR && stack[c].val.str != NULL)
	159	if (stack[c].type == STACK_STR)
160	160	free(stack[c].val.str);
161	161	stack[c].identifier = NULL;
162	162	stack[c].val.str = NULL;

-1

src/config_parser.c less more

170	170
171	171	static void clear_stack(void) {
172	172	for (int c = 0; c < 10; c++) {
173		if (stack[c].type == STACK_STR && stack[c].val.str != NULL)
	173	if (stack[c].type == STACK_STR)
174	174	free(stack[c].val.str);
175	175	stack[c].identifier = NULL;
176	176	stack[c].val.str = NULL;

-2

src/load_layout.c less more

-2

src/util.c less more

500	500	fclose(f);
501	501	if ((ssize_t)n != stbuf.st_size) {
502	502	ELOG("File \"%s\" could not be read entirely: got %zd, want %" PRIi64 "\n", path, n, (int64_t)stbuf.st_size);
503		free(*buf);
504		*buf = NULL;
	503	FREE(*buf);
505	504	return -1;
506	505	}
507	506	return (ssize_t)n;