nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use scalloc instead of some places where calloc was still used

This commit is contained in:
Michael Stapelberg 2010-03-02 14:42:24 +01:00
parent aae824b1f3
commit d08ec00329
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ipc.c
View File

@ -201,13 +201,13 @@ void ipc_new_client(EV_P_ struct ev_io *w, int revents) {
set_nonblock(client); set_nonblock(client);
struct ev_io *package = calloc(sizeof(struct ev_io), 1); struct ev_io *package = scalloc(sizeof(struct ev_io));
ev_io_init(package, ipc_receive_message, client, EV_READ); ev_io_init(package, ipc_receive_message, client, EV_READ);
ev_io_start(EV_A_ package); ev_io_start(EV_A_ package);
DLOG("IPC: new client connected\n"); DLOG("IPC: new client connected\n");
struct ipc_client *new = calloc(sizeof(struct ipc_client), 1); struct ipc_client *new = scalloc(sizeof(struct ipc_client));
new->fd = client; new->fd = client;
TAILQ_INSERT_TAIL(&all_clients, new, clients); TAILQ_INSERT_TAIL(&all_clients, new, clients);

2
src/manage.c
View File

@ -160,7 +160,7 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
LOG("Managing window 0x%08x\n", child); LOG("Managing window 0x%08x\n", child);
DLOG("x = %d, y = %d, width = %d, height = %d\n", x, y, width, height); DLOG("x = %d, y = %d, width = %d, height = %d\n", x, y, width, height);
new = calloc(sizeof(Client), 1); new = scalloc(sizeof(Client));
new->force_reconfigure = true; new->force_reconfigure = true;
/* Update the data structures */ /* Update the data structures */

6
src/table.c
View File

@ -53,7 +53,7 @@ void init_table() {
static void new_container(Workspace *workspace, Container **container, int col, int row, bool skip_layout_switch) { static void new_container(Workspace *workspace, Container **container, int col, int row, bool skip_layout_switch) {
Container *new; Container *new;
new = *container = calloc(sizeof(Container), 1); new = *container = scalloc(sizeof(Container));
CIRCLEQ_INIT(&(new->clients)); CIRCLEQ_INIT(&(new->clients));
new->colspan = 1; new->colspan = 1;
new->rowspan = 1; new->rowspan = 1;
@ -131,7 +131,7 @@ void expand_table_cols(Workspace *workspace) {
workspace->width_factor[workspace->cols-1] = 0; workspace->width_factor[workspace->cols-1] = 0;
workspace->table = realloc(workspace->table, sizeof(Container**) * workspace->cols); workspace->table = realloc(workspace->table, sizeof(Container**) * workspace->cols);
workspace->table[workspace->cols-1] = calloc(sizeof(Container*) * workspace->rows, 1); workspace->table[workspace->cols-1] = scalloc(sizeof(Container*) * workspace->rows);
for (int c = 0; c < workspace->rows; c++) for (int c = 0; c < workspace->rows; c++)
new_container(workspace, &(workspace->table[workspace->cols-1][c]), workspace->cols-1, c, true); new_container(workspace, &(workspace->table[workspace->cols-1][c]), workspace->cols-1, c, true);
@ -158,7 +158,7 @@ void expand_table_cols_at_head(Workspace *workspace) {
workspace->width_factor[0] = 0; workspace->width_factor[0] = 0;
workspace->table = realloc(workspace->table, sizeof(Container**) * workspace->cols); workspace->table = realloc(workspace->table, sizeof(Container**) * workspace->cols);
workspace->table[workspace->cols-1] = calloc(sizeof(Container*) * workspace->rows, 1); workspace->table[workspace->cols-1] = scalloc(sizeof(Container*) * workspace->rows);
/* Move the other columns */ /* Move the other columns */
for (int rows = 0; rows < workspace->rows; rows++) for (int rows = 0; rows < workspace->rows; rows++)