Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't ignore return value from read and write 

New gcc sometimes complains about this.

Signed-off-by: NeilBrown <neilb@suse.com>
This commit is contained in:
NeilBrown 2015-07-24 16:11:23 +10:00
parent d8f82d1d88
commit 27aefbdb3d
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
managemon.c
View File

@ -410,7 +410,9 @@ static int sysfs_open2(char *devnum, char *name, char *attr)
* never needs too. * never needs too.
*/ */
char buf[200]; char buf[200];
read(fd, buf, sizeof(buf)); if (read(fd, buf, sizeof(buf)) < 0)
/* pretend not to ignore return value */
return fd;
} }
return fd; return fd;
} }

24
xmalloc.c
View File

@ -35,42 +35,50 @@ void *xmalloc(size_t len)
{ {
void *rv = malloc(len); void *rv = malloc(len);
char *msg; char *msg;
int n;
if (rv) if (rv)
return rv; return rv;
msg = ": memory allocation failure - aborting\n"; msg = ": memory allocation failure - aborting\n";
write(2, Name, strlen(Name)); n = write(2, Name, strlen(Name));
exit(4+!!write(2, msg, strlen(msg))); n += write(2, msg, strlen(msg));
exit(4+!!n);
} }
void *xrealloc(void *ptr, size_t len) void *xrealloc(void *ptr, size_t len)
{ {
void *rv = realloc(ptr, len); void *rv = realloc(ptr, len);
char *msg; char *msg;
int n;
if (rv) if (rv)
return rv; return rv;
msg = ": memory allocation failure - aborting\n"; msg = ": memory allocation failure - aborting\n";
write(2, Name, strlen(Name)); n = write(2, Name, strlen(Name));
exit(4+!!write(2, msg, strlen(msg))); n += write(2, msg, strlen(msg));
exit(4+!!n);
} }
void *xcalloc(size_t num, size_t size) void *xcalloc(size_t num, size_t size)
{ {
void *rv = calloc(num, size); void *rv = calloc(num, size);
char *msg; char *msg;
int n;
if (rv) if (rv)
return rv; return rv;
msg = ": memory allocation failure - aborting\n"; msg = ": memory allocation failure - aborting\n";
write(2, Name, strlen(Name)); n = write(2, Name, strlen(Name));
exit(4+!!write(2, msg, strlen(msg))); n += write(2, msg, strlen(msg));
exit(4+!!n);
} }
char *xstrdup(const char *str) char *xstrdup(const char *str)
{ {
char *rv = strdup(str); char *rv = strdup(str);
char *msg; char *msg;
int n;
if (rv) if (rv)
return rv; return rv;
msg = ": memory allocation failure - aborting\n"; msg = ": memory allocation failure - aborting\n";
write(2, Name, strlen(Name)); n = write(2, Name, strlen(Name));
exit(4+!!write(2, msg, strlen(msg))); n += write(2, msg, strlen(msg));
exit(4+!!n);
} }