aboutsummaryrefslogtreecommitdiff
path: root/libi3/safewrappers.c
diff options
context:
space:
mode:
Diffstat (limited to 'libi3/safewrappers.c')
-rw-r--r--libi3/safewrappers.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/libi3/safewrappers.c b/libi3/safewrappers.c
index 767a0f05..c82dcd93 100644
--- a/libi3/safewrappers.c
+++ b/libi3/safewrappers.c
@@ -20,36 +20,41 @@
*/
void *smalloc(size_t size) {
void *result = malloc(size);
- if (result == NULL)
+ if (result == NULL) {
err(EXIT_FAILURE, "malloc(%zd)", size);
+ }
return result;
}
void *scalloc(size_t num, size_t size) {
void *result = calloc(num, size);
- if (result == NULL)
+ if (result == NULL) {
err(EXIT_FAILURE, "calloc(%zd, %zd)", num, size);
+ }
return result;
}
void *srealloc(void *ptr, size_t size) {
void *result = realloc(ptr, size);
- if (result == NULL && size > 0)
+ if (result == NULL && size > 0) {
err(EXIT_FAILURE, "realloc(%zd)", size);
+ }
return result;
}
char *sstrdup(const char *str) {
char *result = strdup(str);
- if (result == NULL)
+ if (result == NULL) {
err(EXIT_FAILURE, "strdup()");
+ }
return result;
}
char *sstrndup(const char *str, size_t size) {
char *result = strndup(str, size);
- if (result == NULL)
+ if (result == NULL) {
err(EXIT_FAILURE, "strndup()");
+ }
return result;
}
@@ -58,8 +63,9 @@ int sasprintf(char **strp, const char *fmt, ...) {
int result;
va_start(args, fmt);
- if ((result = vasprintf(strp, fmt, args)) == -1)
+ if ((result = vasprintf(strp, fmt, args)) == -1) {
err(EXIT_FAILURE, "asprintf(%s)", fmt);
+ }
va_end(args);
return result;
}
@@ -70,8 +76,9 @@ ssize_t writeall(int fd, const void *buf, size_t count) {
while (written < count) {
const ssize_t n = write(fd, ((char *)buf) + written, count - written);
if (n == -1) {
- if (errno == EINTR || errno == EAGAIN)
+ if (errno == EINTR || errno == EAGAIN) {
continue;
+ }
return n;
}
written += (size_t)n;
@@ -103,10 +110,11 @@ ssize_t swrite(int fd, const void *buf, size_t count) {
ssize_t n;
n = writeall(fd, buf, count);
- if (n == -1)
+ if (n == -1) {
err(EXIT_FAILURE, "Failed to write %d", fd);
- else
+ } else {
return n;
+ }
}
/*