Date: Sat, 10 Dec 2016 23:58:14 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309840 - head/sbin/camcontrol Message-ID: <201612102358.uBANwE7g020419@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Dec 10 23:58:14 2016 New Revision: 309840 URL: https://svnweb.freebsd.org/changeset/base/309840 Log: Cut to the chase and just call free instead of free(x) + x = NULL 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 Modified: head/sbin/camcontrol/timestamp.c Modified: head/sbin/camcontrol/timestamp.c ============================================================================== --- head/sbin/camcontrol/timestamp.c Sat Dec 10 23:26:34 2016 (r309839) +++ head/sbin/camcontrol/timestamp.c Sat Dec 10 23:58:14 2016 (r309840) @@ -336,11 +336,6 @@ timestamp(struct cam_device *device, int 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 } 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 } 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 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 } } -#undef FREE - if (action == -1) { warnx("Must specify an action, either -r or -s"); error = 1;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612102358.uBANwE7g020419>