summaryrefslogtreecommitdiffstats
path: root/Header.c
diff options
context:
space:
mode:
authorHisham <hisham@gobolinux.org>2016-02-02 15:53:02 +0100
committerHisham <hisham@gobolinux.org>2016-02-02 15:53:02 +0100
commitb54d2dde407921caa7561dde6b45831ba93d0840 (patch)
treecd81eea35dd65e46d22f2801ea403e1efc06eb59 /Header.c
parenta1f7f2869ec2bd860d5b4e4b39736ca877afdf6f (diff)
Check for failure in allocations.
Diffstat (limited to 'Header.c')
-rw-r--r--Header.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/Header.c b/Header.c
index e0555c0e..929a6e0e 100644
--- a/Header.c
+++ b/Header.c
@@ -41,8 +41,8 @@ typedef struct Header_ {
#endif
Header* Header_new(struct ProcessList_* pl, Settings* settings, int nrColumns) {
- Header* this = calloc(1, sizeof(Header));
- this->columns = calloc(nrColumns, sizeof(Vector*));
+ Header* this = xCalloc(1, sizeof(Header));
+ this->columns = xCalloc(nrColumns, sizeof(Vector*));
this->settings = settings;
this->pl = pl;
this->nrColumns = nrColumns;
@@ -83,13 +83,13 @@ void Header_writeBackToSettings(const Header* this) {
Vector* vec = this->columns[col];
int len = Vector_size(vec);
- colSettings->names = calloc(len+1, sizeof(char*));
- colSettings->modes = calloc(len, sizeof(int));
+ colSettings->names = xCalloc(len+1, sizeof(char*));
+ colSettings->modes = xCalloc(len, sizeof(int));
colSettings->len = len;
for (int i = 0; i < len; i++) {
Meter* meter = (Meter*) Vector_get(vec, i);
- char* name = calloc(64, sizeof(char));
+ char* name = xCalloc(64, sizeof(char));
if (meter->param) {
snprintf(name, 63, "%s(%d)", As_Meter(meter)->name, meter->param);
} else {
@@ -151,7 +151,7 @@ char* Header_readMeterName(Header* this, int i, int column) {
int nameLen = strlen(Meter_name(meter));
int len = nameLen + 100;
- char* name = malloc(len);
+ char* name = xMalloc(len);
strncpy(name, Meter_name(meter), nameLen);
name[nameLen] = '\0';
if (meter->param)

© 2014-2024 Faster IT GmbH | imprint | privacy policy