system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 17:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cut to the chase and just call free instead of free(x) + x = NULL

Browse source 
NULLing out x wasn't required as the memory was immediately scribbled
over with strdup in the following call.

MFC after:	1 week
Submitted by:	imp
This commit is contained in:
Enji Cooper 2016-12-10 23:58:14 +00:00
parent 110559ba69
commit f2a12bce27
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=309840
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sbin/camcontrol/timestamp.c
View file

@ -336,11 +336,6 @@ timestamp(struct cam_device *device, int argc, char **argv, char *combinedopt,
int single_arg = 0;
int do_utc = 0;
#define FREE(x) do { \
free(x); \
x = NULL; \
} while(0)
while ((c = getopt(argc, argv, combinedopt)) != -1) {
switch (c) {
case 'r': {
@ -363,7 +358,7 @@ timestamp(struct cam_device *device, int argc, char **argv, char *combinedopt,
}
case 'f': {
single_arg++;
FREE(format_string);
free(format_string);
format_string = strdup(optarg);
if (format_string == NULL) {
warn("Error allocating memory for format "
@ -375,7 +370,7 @@ timestamp(struct cam_device *device, int argc, char **argv, char *combinedopt,
}
case 'm': {
single_arg++;
FREE(format_string);
free(format_string);
format_string = strdup(MIL);
if (format_string == NULL) {
warn("Error allocating memory");
@ -389,7 +384,7 @@ timestamp(struct cam_device *device, int argc, char **argv, char *combinedopt,
break;
}
case 'T':
FREE(timestamp_string);
free(timestamp_string);
timestamp_string = strdup(optarg);
if (timestamp_string == NULL) {
warn("Error allocating memory for format "
@ -403,8 +398,6 @@ timestamp(struct cam_device *device, int argc, char **argv, char *combinedopt,
}
}
#undef FREE
if (action == -1) {
warnx("Must specify an action, either -r or -s");
error = 1;