micahmoore/malloclab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed attribute warn_unused_result warnings on recent libc headers

Browse Source
This commit is contained in:
Godmar Back 2016-04-10 09:24:30 -04:00
parent fab3f24f1c
commit 73d29a565e
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mdriver.c
View File

@ -668,10 +668,15 @@ static trace_t *read_trace(char *tracedir, char *filename, int verbose)
sprintf(msg, "Could not open %s in read_trace", path); sprintf(msg, "Could not open %s in read_trace", path);
unix_error(msg); unix_error(msg);
} }
fscanf(tracefile, "%d", &(trace->sugg_heapsize)); /* not used */ int rc;
fscanf(tracefile, "%d", &(trace->num_ids)); rc = fscanf(tracefile, "%d", &(trace->sugg_heapsize)); /* not used */
fscanf(tracefile, "%d", &(trace->num_ops)); assert (rc == 1);
fscanf(tracefile, "%d", &(trace->weight)); /* not used */ rc = fscanf(tracefile, "%d", &(trace->num_ids));
assert (rc == 1);
rc = fscanf(tracefile, "%d", &(trace->num_ops));
assert (rc == 1);
rc = fscanf(tracefile, "%d", &(trace->weight)); /* not used */
assert (rc == 1);
/* We'll store each request line in the trace in this array */ /* We'll store each request line in the trace in this array */
if ((trace->ops = if ((trace->ops =
@ -694,21 +699,24 @@ static trace_t *read_trace(char *tracedir, char *filename, int verbose)
while (fscanf(tracefile, "%s", type) != EOF) { while (fscanf(tracefile, "%s", type) != EOF) {
switch(type[0]) { switch(type[0]) {
case 'a': case 'a':
fscanf(tracefile, "%u %u", &index, &size); rc = fscanf(tracefile, "%u %u", &index, &size);
assert (rc == 2);
trace->ops[op_index].type = ALLOC; trace->ops[op_index].type = ALLOC;
trace->ops[op_index].index = index; trace->ops[op_index].index = index;
trace->ops[op_index].size = size; trace->ops[op_index].size = size;
max_index = (index > max_index) ? index : max_index; max_index = (index > max_index) ? index : max_index;
break; break;
case 'r': case 'r':
fscanf(tracefile, "%u %u", &index, &size); rc = fscanf(tracefile, "%u %u", &index, &size);
assert (rc == 2);
trace->ops[op_index].type = REALLOC; trace->ops[op_index].type = REALLOC;
trace->ops[op_index].index = index; trace->ops[op_index].index = index;
trace->ops[op_index].size = size; trace->ops[op_index].size = size;
max_index = (index > max_index) ? index : max_index; max_index = (index > max_index) ? index : max_index;
break; break;
case 'f': case 'f':
fscanf(tracefile, "%ud", &index); rc = fscanf(tracefile, "%ud", &index);
assert (rc == 1);
trace->ops[op_index].type = FREE; trace->ops[op_index].type = FREE;
trace->ops[op_index].index = index; trace->ops[op_index].index = index;
break; break;