Skip to content

Commit be5d646

Browse files
author
gruszczy
committed
fixing warnings about ignoring return value
1 parent 6832481 commit be5d646

File tree

3 files changed

+21
-7
lines changed

3 files changed

+21
-7
lines changed

structure/necessary.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,8 @@ char * build_snapshot(struct file_system_info *fsinfo, revision_t *revisions, in
379379
gmstrcpy(&snapshot, data_dir, "/", fsinfo->repo_names[repo_index], "/", revisions[i].file, 0);
380380
if ((revision_desc = open(snapshot, O_RDONLY)) == -1)
381381
build_snapshot_error;
382-
write(snapshot_desc, "\n", 1);
382+
if (write(snapshot_desc, "\n", 1) == -1)
383+
build_snapshot_error;
383384
if (gdesccopy(revision_desc, snapshot_desc))
384385
build_snapshot_error;
385386
gstrdel(snapshot);

support/grdiff.c

+17-5
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,14 @@ int snapshot_copy(char *revision, char *target, char *directory){
329329
return -1;
330330
};
331331
while ((result = read(revision_desc, buffer, 1024)) != 0)
332-
write(snapshot_desc, buffer, result);
332+
if (write(snapshot_desc, buffer, result) == -1){
333+
close(snapshot_desc);
334+
close(revision_desc);
335+
return -1;
336+
}
333337
close(snapshot_desc);
334338
close(revision_desc);
335-
return 0;
339+
return result;
336340

337341
};
338342

@@ -355,12 +359,20 @@ int snapshot_append(char *revision, char *target, char *directory){
355359
return -1;
356360
};
357361
buffer[0] = '\n';
358-
write(snapshot_desc, buffer, 1);
362+
if (write(snapshot_desc, buffer, 1) == -1){
363+
close(snapshot_desc);
364+
return -1;
365+
}
366+
359367
while ((result = read(revision_desc, buffer, 1024)) != 0)
360-
write(snapshot_desc, buffer, result);
368+
if (write(snapshot_desc, buffer, result) == -1){
369+
close(snapshot_desc);
370+
close(revision_desc);
371+
return -1;
372+
}
361373
close(snapshot_desc);
362374
close(revision_desc);
363-
return 0;
375+
return result;
364376

365377
};
366378

support/gutils.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ int gdesccopy(int source, int dest){
66
char buffer[1024];
77
int result = 0;
88
while ((result = read(source, buffer, 1024)) > 0){
9-
write(dest, buffer, result);
9+
if (write(dest, buffer, result) == -1)
10+
return -1;
1011
}
1112
if (result == -1)
1213
return -1;

0 commit comments

Comments
 (0)