From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 19 Mar 2022 17:42:24 +0000 (-0700)
Subject: gvParseArgs etc: remove tests for 'NULL' members in 'argv'
X-Git-Tag: 4.0.0~163^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb3763f5f3c3509fc7532cc6284c585eae1e808c;p=graphviz

gvParseArgs etc: remove tests for 'NULL' members in 'argv'

The strings in `argv` within the range of `argc` are guaranteed non-null.
---

diff --git a/lib/common/args.c b/lib/common/args.c
index f1c5f3b71..dff892498 100644
--- a/lib/common/args.c
+++ b/lib/common/args.c
@@ -17,6 +17,7 @@
  * Needs to be fixed before layout engines can be plugins.
  */
 
+#include <assert.h>
 #include <cgraph/likely.h>
 #include <ctype.h>
 #include <common/render.h>
@@ -37,7 +38,8 @@ static int neato_extra_args(int argc, char** argv) {
 
   for (i = 1; i < argc; i++) {
     arg = argv[i];
-    if (arg && *arg == '-') {
+    assert(arg != NULL);
+    if (*arg == '-') {
       switch (arg[1]) {
       case 'x' : Reduce = TRUE; break;
       case 'n':
@@ -80,7 +82,8 @@ static int memtest_extra_args(int argc, char** argv) {
 
   for (i = 1; i < argc; i++) {
     arg = argv[i];
-    if (arg && *arg == '-') {
+    assert(arg != NULL);
+    if (*arg == '-') {
       switch (arg[1]) {
       case 'm' :
         if (arg[2]) {
@@ -124,7 +127,8 @@ config_extra_args(GVC_t *gvc, int argc, char** argv)
 
   for (i = 1; i < argc; i++) {
     arg = argv[i];
-    if (arg && *arg == '-') {
+    assert(arg != NULL);
+    if (*arg == '-') {
       switch (arg[1]) {
       case 'v':
 	gvc->common.verbose = 1;
@@ -242,7 +246,8 @@ static int fdp_extra_args(int argc, char** argv) {
 
   for (i = 1; i < argc; i++) {
     arg = argv[i];
-    if (arg && (*arg == '-') && (*(arg+1) == 'L')) {
+    assert(arg != NULL);
+    if ((*arg == '-') && (*(arg+1) == 'L')) {
       if (setFDPAttr (arg+2)) {
 	dotneato_usage(1);
 	return -1;