From 14d056e82a8c855dcfc9eb88890f3b1156b64d64 Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 6 Mar 2021 14:09:53 -0800 Subject: [PATCH] rephrase unnecessarily cryptic string comparisons in lefty --- cmd/lefty/aix_mods/exec.c | 3 ++- cmd/lefty/dot2l/dotlex.c | 9 +++++---- cmd/lefty/exec.c | 3 ++- cmd/lefty/g.c | 5 +++-- cmd/lefty/internal.c | 5 +++-- cmd/lefty/lex.c | 3 ++- cmd/lefty/os/unix/io.c | 3 ++- cmd/lefty/ws/gtk/gcanvas.c | 3 ++- cmd/lefty/ws/mswin32/gcanvas.c | 3 ++- cmd/lefty/ws/mswin32/gpcanvas.c | 3 ++- cmd/lefty/ws/x11/gbutton.c | 3 ++- cmd/lefty/ws/x11/gcanvas.c | 3 ++- cmd/lefty/ws/x11/gpcanvas.c | 3 ++- 13 files changed, 31 insertions(+), 18 deletions(-) diff --git a/cmd/lefty/aix_mods/exec.c b/cmd/lefty/aix_mods/exec.c index cad42210d..7fb826b9f 100644 --- a/cmd/lefty/aix_mods/exec.c +++ b/cmd/lefty/aix_mods/exec.c @@ -17,6 +17,7 @@ #include "str.h" #include "exec.h" #include "internal.h" +#include static lvar_t *lvarp; static int lvarn, llvari, flvari; @@ -985,7 +986,7 @@ static void printbody(char *s, int mode) } c = '\000'; for (s1 = s; *s1; s1++) - if (*s1 == '>' && *(s1 + 1) && *(s1 + 1) == '>') + if (strncmp(s1, ">>", 2) == 0) break; if (!*s1) return; diff --git a/cmd/lefty/dot2l/dotlex.c b/cmd/lefty/dot2l/dotlex.c index e75d36d70..c404913ad 100644 --- a/cmd/lefty/dot2l/dotlex.c +++ b/cmd/lefty/dot2l/dotlex.c @@ -16,6 +16,7 @@ typedef void *Tobj; #include "dot2l.h" #include "leftyio.h" #include "triefa.c" +#include static int syntax_errors; static int lexer_fd; @@ -67,7 +68,7 @@ int yylex (void) { /* get a nonempty lex buffer */ do { - if ((lexptr == NULL) || (lexptr[0] == '\0')) + if ((lexptr == NULL) || strcmp(lexptr, "") == 0) if ((lexptr = lex_gets (0)) == NULL) { if (in_comment) fprintf ( @@ -78,7 +79,7 @@ int yylex (void) { return EOF; } lexptr = skip_wscomments (lexptr); - } while (lexptr[0] == '\0'); + } while (strcmp(lexptr, "") == 0); /* scan quoted strings */ if (lexptr[0] == '\"') { @@ -249,7 +250,7 @@ static char *scan_token (char *p) { char *q; q = lexbuf; - if (!p || *p == '\0') + if (!p || strcmp(p, "") == 0) return NULL; while (isalnum (*p) || (*p == '_') || (!isascii (*p))) *q++ = *p++; @@ -307,7 +308,7 @@ static char *quoted_string (char *p) { } *q++ = *p++; } - if (*p == '\0') + if (strcmp(p, "") == 0) yyerror ("string ran past end of line", ""); else p++; diff --git a/cmd/lefty/exec.c b/cmd/lefty/exec.c index d838e605a..9b33af78a 100644 --- a/cmd/lefty/exec.c +++ b/cmd/lefty/exec.c @@ -17,6 +17,7 @@ #include "str.h" #include "exec.h" #include "internal.h" +#include static lvar_t *lvarp; static int lvarn, llvari, flvari; @@ -989,7 +990,7 @@ static void printbody (char *s, int mode) { } c = '\000'; for (s1 = s; *s1; s1++) - if (*s1 == '>' && *(s1 + 1) && *(s1 + 1) == '>') + if (strncmp(s1, ">>", 2) == 0) break; if (!*s1) return; diff --git a/cmd/lefty/g.c b/cmd/lefty/g.c index 6bf11c824..a9c9ff51f 100644 --- a/cmd/lefty/g.c +++ b/cmd/lefty/g.c @@ -14,6 +14,7 @@ #include "g.h" #include "gcommon.h" #include "mem.h" +#include Gwidget_t *Gwidgets; int Gwidgetn; @@ -587,7 +588,7 @@ int Gtext ( return -1; } widget = &Gwidgets[wi]; - if (string[0] == '\000') + if (strcmp(string, "") == 0) return 0; n = unpackstring (string); if (!justs[0] || !justs[1]) @@ -622,7 +623,7 @@ int Ggettextsize (int wi, char *string, char *fn, double fs, Gsize_t *gsp) { Gerr (POS, G_ERRNOTACANVAS, wi); return -1; } - if (string[0] == '\000') { + if (strcmp(string, "") == 0) { gsp->x = gsp->y = 0.0; return 0; } diff --git a/cmd/lefty/internal.c b/cmd/lefty/internal.c index 04c2010ef..f084c9a0c 100644 --- a/cmd/lefty/internal.c +++ b/cmd/lefty/internal.c @@ -28,6 +28,7 @@ #include "gmap2l.h" #endif #include "internal.h" +#include #ifndef FEATURE_MS #include #endif @@ -404,7 +405,7 @@ int Isplit (int argc, lvar_t *argv) { qflag = (argc == 3) ? FALSE : TRUE; sp = Tgetstring (so); s = Tgetstring (fo); - if (s[0] == '\\' && s[1] == 'n') + if (strncmp(s, "\\n", 2) == 0) fc = '\n'; else fc = s[0]; @@ -616,7 +617,7 @@ int Iload (int argc, lvar_t *argv) { Tobj co; if ((fn = Tgetstring (argv[0].o))) { - if (fn[0] == '-' && fn[1] == '\000') + if (strcmp(fn, "-") == 0) fp = stdin; else { fp = NULL; diff --git a/cmd/lefty/lex.c b/cmd/lefty/lex.c index ab0313872..793a49de0 100644 --- a/cmd/lefty/lex.c +++ b/cmd/lefty/lex.c @@ -12,6 +12,7 @@ #include "common.h" #include "lex.h" +#include int Ltok; char Lstrtok[MAXTOKEN]; @@ -237,7 +238,7 @@ static int gtok (void) { static int sgetc (void) { if (seeneof) return EOF; - if (*ucp == '\000') { + if (strcmp(ucp, "") == 0) { if (lsrc == CHARSRC) { seeneof = TRUE; linenum++; diff --git a/cmd/lefty/os/unix/io.c b/cmd/lefty/os/unix/io.c index 1cb17fefb..0e34ee8ca 100644 --- a/cmd/lefty/os/unix/io.c +++ b/cmd/lefty/os/unix/io.c @@ -18,6 +18,7 @@ #include "mem.h" #include #include +#include #include #ifndef HAVE_TERMIOS_H #include @@ -418,7 +419,7 @@ static void pipeopen (char *cmd, FILE **ifp, FILE **ofp, int *pidp) { case 0: close (p1[0]), close (p2[1]); for (s = cmd; *s; s++) - if (*s == '%' && *(s + 1) && *(s + 1) == 'd') { + if (strncmp(s, "%d", 2) == 0) { sprintf (cmd2, cmd, p2[0], p1[1]); execl (shell, shbname, "-c", cmd2, NULL); panic2 (POS, "pipeopen", "child cannot exec: %s\n", cmd2); diff --git a/cmd/lefty/ws/gtk/gcanvas.c b/cmd/lefty/ws/gtk/gcanvas.c index 57f0b7516..4d0771818 100644 --- a/cmd/lefty/ws/gtk/gcanvas.c +++ b/cmd/lefty/ws/gtk/gcanvas.c @@ -12,6 +12,7 @@ #include "common.h" #include "g.h" #include "gcommon.h" +#include #define WCU widget->u.c #define WINDOW widget->u.c->window @@ -646,7 +647,7 @@ static GdkFont *findfont(char *name, int size) GdkFont *font; int fi, n, i; - if (name[0] == '\000') + if (strcmp(name, "") == 0) return Gfontp[0].font; sprintf(&Gbufp[0], name, size); diff --git a/cmd/lefty/ws/mswin32/gcanvas.c b/cmd/lefty/ws/mswin32/gcanvas.c index f8621d54d..47f839c7d 100644 --- a/cmd/lefty/ws/mswin32/gcanvas.c +++ b/cmd/lefty/ws/mswin32/gcanvas.c @@ -14,6 +14,7 @@ #include "g.h" #include "gcommon.h" #include "mem.h" +#include #define WCU widget->u.c #define WINDOW widget->u.c->window @@ -761,7 +762,7 @@ static HFONT findfont (char *name, int size) { HFONT font; int fi; - if (name[0] == '\000') + if (strcmp(name, "") == 0) return Gfontp[0].font; sprintf (&Gbufp[0], name, size); diff --git a/cmd/lefty/ws/mswin32/gpcanvas.c b/cmd/lefty/ws/mswin32/gpcanvas.c index 8af2911da..d9bc1725f 100644 --- a/cmd/lefty/ws/mswin32/gpcanvas.c +++ b/cmd/lefty/ws/mswin32/gpcanvas.c @@ -14,6 +14,7 @@ #include "g.h" #include "gcommon.h" #include "mem.h" +#include #define WPU widget->u.p #define WINDOW widget->u.p->window @@ -674,7 +675,7 @@ static HFONT findfont (char *name, int size) { HFONT font; int fi; - if (name[0] == '\000') + if (strcmp(name, "") == 0) return Gfontp[0].font; sprintf (&Gbufp[0], name, size); diff --git a/cmd/lefty/ws/x11/gbutton.c b/cmd/lefty/ws/x11/gbutton.c index 83a20bb6e..93d1d3fe8 100644 --- a/cmd/lefty/ws/x11/gbutton.c +++ b/cmd/lefty/ws/x11/gbutton.c @@ -13,6 +13,7 @@ #include "common.h" #include "g.h" #include "gcommon.h" +#include #define WBU widget->u.b @@ -80,7 +81,7 @@ int GBcreatewidget ( return -1; } } - if (!s || s[0] == '\000') { + if (!s || strcmp(s, "") == 0) { ADD2ARGS (XtNwidth, ps.x); ADD2ARGS (XtNheight, ps.y); } else { diff --git a/cmd/lefty/ws/x11/gcanvas.c b/cmd/lefty/ws/x11/gcanvas.c index e83bfcdd0..0466f982f 100644 --- a/cmd/lefty/ws/x11/gcanvas.c +++ b/cmd/lefty/ws/x11/gcanvas.c @@ -17,6 +17,7 @@ #ifdef FEATURE_GMAP #include #endif +#include #define WCU widget->u.c #define WINDOW widget->u.c->window @@ -866,7 +867,7 @@ static XFontStruct *findfont (char *name, int size) { XFontStruct *font; int fi, n, i; - if (name[0] == '\000') + if (strcmp(name, "") == 0) return Gfontp[0].font; sprintf (&Gbufp[0], name, size); diff --git a/cmd/lefty/ws/x11/gpcanvas.c b/cmd/lefty/ws/x11/gpcanvas.c index 32445760a..876ad4305 100644 --- a/cmd/lefty/ws/x11/gpcanvas.c +++ b/cmd/lefty/ws/x11/gpcanvas.c @@ -14,6 +14,7 @@ #include "g.h" #include "gcommon.h" #include "mem.h" +#include #define PSDPI 300.0 #define PSMAXPIXW (8.0 * PSDPI) @@ -515,7 +516,7 @@ int GPtext ( static char *findfont (char *name) { char *font; - if (name[0] == '\000' || strcmp (name, "default") == 0) + if (strcmp(name, "") == 0 || strcmp (name, "default") == 0) font = "Times-Roman"; else font = name; -- 2.40.0