summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Staessens <dimitri.staessens@intec.ugent.be>2016-02-26 14:57:24 +0100
committerDimitri Staessens <dimitri.staessens@intec.ugent.be>2016-02-26 14:57:24 +0100
commitbb1d3fd141c33a98137edd9261a9adb9ea1d3753 (patch)
tree7c6e7c7513f4dddcf3f3e4c563b3ebf23a7265ab
parent44fa4a0d43a4026a091f82a055c649aa7c922706 (diff)
downloadouroboros-bb1d3fd141c33a98137edd9261a9adb9ea1d3753.tar.gz
ouroboros-bb1d3fd141c33a98137edd9261a9adb9ea1d3753.zip
doc: updated workflow and corrected all mallocs
lib/du_buff contained casted malloc's.
-rw-r--r--doc/workflow.txt14
-rw-r--r--src/lib/du_buff.c6
2 files changed, 14 insertions, 6 deletions
diff --git a/doc/workflow.txt b/doc/workflow.txt
index e48375bb..02d13f64 100644
--- a/doc/workflow.txt
+++ b/doc/workflow.txt
@@ -21,13 +21,21 @@ int * a;
instead of
int *a;
-- don't explicitly cast malloc, but do
+- Don't explicitly cast malloc, but do
your * = malloc (sizeof *your * len);
-- when checking for invalid pointers use
+or
-if (ptr == NULL), instead of if (!ptr)
+your * = malloc (sizeof (*your) * len);
+
+- When checking for invalid pointers use
+
+if (ptr == NULL)
+
+instead of
+
+if (!ptr)
3. Development workflow
diff --git a/src/lib/du_buff.c b/src/lib/du_buff.c
index 324dccc5..ea6206f9 100644
--- a/src/lib/du_buff.c
+++ b/src/lib/du_buff.c
@@ -84,7 +84,7 @@ struct buffer * buffer_create (size_t size, size_t headspace, size_t len)
size_t ts = size - (headspace + len);
bool head_block = true;
- head = (struct buffer *) malloc(sizeof(struct buffer));
+ head = malloc(sizeof *head);
head->size=0;
head->data=NULL;
@@ -108,14 +108,14 @@ struct buffer * buffer_create (size_t size, size_t headspace, size_t len)
sz = remaining < page_size ? remaining : page_size;
}
- buf = (struct buffer *) malloc(sizeof(struct buffer));
+ buf = malloc(sizeof *buf);
if (buf == NULL) {
LOG_WARN("Could not allocate struct.");
return NULL;
}
if (sz > 0) {
- buf->data = (uint8_t *) malloc(sz);
+ buf->data = malloc(sz);
if (buf->data == NULL) {
LOG_WARN("Could not allocate memory block.");
buffer_destroy_list(head);