Sivecano/dwl - Change HFIKAPN3TBMDVBDG7SZLX4ZJMSFFDGINTO6C2SKO5IVYUILGCQEQC

new functions ecalloc() and die()

die() replaces EBARF and BARF and allow us to add -pedantic to CFLAGS

Created by Leonardo Hernández Hernández on March 15, 2022

HFIKAPN3TBMDVBDG7SZLX4ZJMSFFDGINTO6C2SKO5IVYUILGCQEQC

Dependencies

In channels

main

Change contents

File addition: util.h (----------)

[9.2]

/* See LICENSE.dwm file for copyright and license details. */
void die(const char *fmt, ...);
void *ecalloc(size_t nmemb, size_t size);

File addition: util.c (----------)

[9.2]

/* See LICENSE.dwm file for copyright and license details. */
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "util.h"
void *
ecalloc(size_t nmemb, size_t size)
{
	void *p;
	if (!(p = calloc(nmemb, size)))
		die("calloc:");
	return p;
}
void
die(const char *fmt, ...) {
	va_list ap;
	va_start(ap, fmt);
	vfprintf(stderr, fmt, ap);
	va_end(ap);
	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
		fputc(' ', stderr);
		perror(NULL);
	} else {
		fputc('\n', stderr);
	}
	exit(1);
}

Insertion in dwl.c at line 56 [9.4]
[10.80]
[11.1]
```
#include "util.h"
```

Deletion in dwl.c at line 60 [9.4]

B:BD[12.14] → [13.1:178]

#define BARF(fmt, ...)		do { fprintf(stderr, fmt "\n", ##__VA_ARGS__); exit(EXIT_FAILURE); } while (0)
#define EBARF(fmt, ...)		BARF(fmt ": %s", ##__VA_ARGS__, strerror(errno))

Replacement in dwl.c at line 793 [9.4]

∅:D[14.2419] → [15.2201:2256]

B:BD[16.4586] → [15.2201:2256]

B:BD[15.2256] → [17.4:49]

	Keyboard *kb = device->data = calloc(1, sizeof(*kb));
	if (!kb)
		EBARF("createkeyboard: calloc");

[14.2419]

[18.107]

	Keyboard *kb = device->data = ecalloc(1, sizeof(*kb));

Replacement in dwl.c at line 824 [9.4]

B:BD[14.2561] → [19.4:60]

B:BD[19.60] → [17.50:89]

	Monitor *m = wlr_output->data = calloc(1, sizeof(*m));
	if (!m)
		EBARF("createmon: calloc");

[14.2561]

[19.60]

	Monitor *m = wlr_output->data = ecalloc(1, sizeof(*m));

Replacement in dwl.c at line 909 [9.4]

B:BD[20.545] → [21.770:818]

B:BD[21.818] → [17.90:132]

	c = xdg_surface->data = calloc(1, sizeof(*c));
	if (!c)
		EBARF("createnotify: calloc");

[20.545]

[22.659]

	c = xdg_surface->data = ecalloc(1, sizeof(*c));

Replacement in dwl.c at line 935 [9.4]

B:BD[23.23695] → [14.2841:2890]

B:BD[14.2890] → [17.133:186]

	layersurface = calloc(1, sizeof(LayerSurface));
	if (!layersurface)
		EBARF("layersurface: calloc");

[23.23695]

[8.274]

	layersurface = ecalloc(1, sizeof(LayerSurface));

Replacement in dwl.c at line 1739 [9.4]

B:BD[13.193] → [13.193:237]

		BARF("startup: display_add_socket_auto");

[13.193]

[24.306]

		die("startup: display_add_socket_auto");

Replacement in dwl.c at line 1748 [9.4]
B:BD[13.330] → [13.330:357]
```
			EBARF("startup: fork");
```
[13.330]
[25.813]
```
			die("startup: fork:");
```
Replacement in dwl.c at line 1754 [9.4]
∅:D[26.61] → [13.358:386]
B:BD[25.904] → [13.358:386]
```
			EBARF("startup: execl");
```
[26.61]
[25.980]
```
			die("startup: execl:");
```
Replacement in dwl.c at line 1767 [9.4]
B:BD[5.248] → [5.248:282]
```
		BARF("startup: backend_start");
```
[5.248]
[5.282]
```
		die("startup: backend_start");
```
Replacement in dwl.c at line 1923 [9.4]
∅:D[27.51] → [28.54:89]
∅:D[3.51] → [28.54:89]
∅:D[29.57] → [28.54:89]
B:BD[28.54] → [28.54:89]
```
		BARF("couldn't create backend");
```
[3.51]
[9.30941]
```
		die("couldn't create backend");
```
Replacement in dwl.c at line 1937 [9.4]
B:BD[6.232] → [6.232:268]
```
		BARF("couldn't create renderer");
```
[6.232]
[30.2576]
```
		die("couldn't create renderer");
```
Replacement in dwl.c at line 1942 [9.4]
B:BD[6.359] → [6.359:396]
```
		BARF("couldn't create allocator");
```
[6.359]
[6.396]
```
		die("couldn't create allocator");
```

Replacement in dwl.c at line 2083 [9.4]

B:BD[31.393] → [31.393:435]

		EBARF("can't install SIGCHLD handler");

[31.393]

[31.435]

		die("can't install SIGCHLD handler:");

Replacement in dwl.c at line 2095 [9.4]

B:BD[25.1585] → [13.472:528]

		EBARF("dwl: execvp %s failed", ((char **)arg->v)[0]);

[25.1585]

[32.651]

		die("dwl: execvp %s failed:", ((char **)arg->v)[0]);

Replacement in dwl.c at line 2430 [9.4]

∅:D[15.4305] → [10.1937:1990]

B:BD[10.1937] → [10.1937:1990]

B:BD[10.1990] → [17.187:232]

	c = xwayland_surface->data = calloc(1, sizeof(*c));
	if (!c)
		EBARF("createnotifyx11: calloc");

[10.1937]

[10.1990]

	c = xwayland_surface->data = ecalloc(1, sizeof(*c));

Replacement in dwl.c at line 2510 [9.4]
B:BD[13.562] → [13.562:601]
```
		BARF("XDG_RUNTIME_DIR must be set");
```
[13.562]
[25.3736]
```
		die("XDG_RUNTIME_DIR must be set");
```

Replacement in dwl.c at line 2517 [9.4]

B:BD[33.60] → [2.1:51]

	BARF("Usage: %s [-s startup command]", argv[0]);

[33.60]

[9.36335]

	die("Usage: %s [-s startup command]", argv[0]);

Replacement in config.mk at line 6 [10.4900]

B:BD[10.4954] → [7.5:171]

CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-variable -Wno-unused-result -Wdeclaration-after-statement

[10.4954]

[10.5056]

CFLAGS ?= -g -Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-variable -Wno-unused-result -Wdeclaration-after-statement -pedantic

Replacement in Makefile at line 62 [9.38336]

B:BD[34.87] → [4.9:120]

dwl.o: config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h idle-protocol.h

[34.87]

[35.335]

dwl.o: config.mk config.h client.h xdg-shell-protocol.h wlr-layer-shell-unstable-v1-protocol.h idle-protocol.h util.h

Replacement in Makefile at line 64 [9.38336]

B:BD[35.336] → [36.3004:3085]

dwl: xdg-shell-protocol.o wlr-layer-shell-unstable-v1-protocol.o idle-protocol.o

[35.336]

dwl: xdg-shell-protocol.o wlr-layer-shell-unstable-v1-protocol.o idle-protocol.o util.o