Fri Mar 13 16:43:05 2020 UTC ()

pkgtools/check-portability: elimitate common subexpression


(rillig)

diff -r1.8 -r1.9 pkgsrc/pkgtools/check-portability/files/check-portability.c

--- pkgsrc/pkgtools/check-portability/files/check-portability.c 2020/03/13 16:20:34 1.8
+++ pkgsrc/pkgtools/check-portability/files/check-portability.c 2020/03/13 16:43:05 1.9

 @@ -1,14 +1,14 @@
-/* $NetBSD: check-portability.c,v 1.8 2020/03/13 16:20:34 rillig Exp $ */
+/* $NetBSD: check-portability.c,v 1.9 2020/03/13 16:43:05 rillig Exp $ */
 /*
  Copyright (c) 2020 Roland Illig
  All rights reserved.
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
 . Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
 @@ -516,27 +516,27 @@ check_file(cstr filename)
 	str line = STR_EMPTY;
 	size_t lineno = 0;
 	if (!skip_shebang(basename)) {
 		if (!str_read_line(&line, f))
 			goto cleanup;
 		lineno++;
 		if (!is_shell_shebang(str_c(&line)))
 			goto cleanup;
+	}
 	while (str_read_line(&line, f)) {
 		cstr cline = str_c(&line);
-		if (cstr_contains_char(str_c(&line), '\0'))
+		if (cstr_contains_char(cline, '\0'))
 			break;
 		lineno++;
 		str_charptr(&line);
 		checkline_sh_double_brackets(filename, lineno, cline);
 		checkline_sh_dollar_random(filename, lineno, cline);
 		checkline_sh_test_eqeq(filename, lineno, cline);
+	}
 cleanup:
 	str_free(&line);
 	(void) fclose(f);