Fix some make checkcodebase errors

- Reorder checkpatch ignore flags alphabetically
- Fix checkpatch WARNINGs and CHECKs when they make sense
- Add more checkpatch ignores

src/asm/charmap.c

@@ -163,8 +163,8 @@ int32_t charmap_Add(char *input, uint8_t output)
 	int32_t i;
 	uint8_t v;
 
-	struct Charmap 	*charmap;
-	struct Charnode	*curr_node, *temp_node;
+	struct Charmap  *charmap;
+	struct Charnode *curr_node, *temp_node;
 
 	/*
 	 * If the user tries to define a character mapping inside a section
@@ -217,8 +217,8 @@ int32_t charmap_Add(char *input, uint8_t output)
 
 int32_t charmap_Convert(char **input)
 {
-	struct Charmap 	*charmap;
-	struct Charnode	*charnode;
+	struct Charmap  *charmap;
+	struct Charnode *charnode;
 
 	char *output;
 	char outchar[8];
@@ -249,11 +249,11 @@ int32_t charmap_Convert(char **input)
 		charnode = &charmap->nodes[0];
 
 		/*
-		 * find the longest valid match which has been registered in charmap.
-		 * note that there could be either multiple matches or no match.
-		 * and it possibly takes the longest match between them,
-		 * which means that it ignores partial matches shorter than the longest one.
-		*/
+		 * Find the longest valid match which has been registered in
+		 * charmap, possibly yielding multiple or no matches.
+		 * The longest match is taken, meaning partial matches shorter
+		 * than the longest one are ignored.
+		 */
 		for (i = match = 0; (v = (*input)[i]);) {
 			if (!charnode->next[v])
 				break;

src/asm/fstack.c

@@ -317,7 +317,8 @@ void fstk_AddIncludePath(char *s)
 	if (NextIncPath == MAXINCPATHS)
 		fatalerror("Too many include directories passed from command line");
 
-	if (snprintf(IncludePaths[NextIncPath++], _MAX_PATH, "%s", s) >= _MAX_PATH)
+	if (snprintf(IncludePaths[NextIncPath++], _MAX_PATH, "%s",
+		     s) >= _MAX_PATH)
 		fatalerror("Include path too long '%s'", s);
 }
 

src/asm/lexer.c

@@ -1029,6 +1029,7 @@ static uint32_t yylex_MACROARGS(void)
 int yylex(void)
 {
 	int returnedChar;
+
 	switch (lexerstate) {
 	case LEX_STATE_NORMAL:
 		returnedChar = yylex_NORMAL();

src/asm/output.c

@@ -265,13 +265,12 @@ static void writesymbol(struct sSymbol *pSym, FILE *f)
 	uint32_t offset;
 	int32_t sectid;
 
-	if (!(pSym->nType & SYMF_DEFINED)) {
+	if (!(pSym->nType & SYMF_DEFINED))
 		type = SYMTYPE_IMPORT;
-	} else if (pSym->nType & SYMF_EXPORT) {
+	else if (pSym->nType & SYMF_EXPORT)
 		type = SYMTYPE_EXPORT;
-	} else {
+	else
 		type = SYMTYPE_LOCAL;
-	}
 
 	switch (type) {
 	case SYMTYPE_LOCAL:

src/gfx/gb.c

@@ -199,7 +199,6 @@ void create_mapfiles(const struct Options *opts, struct GBImage *gb,
 		attrmap->size = 0;
 	}
 
-
 	gb_i = 0;
 	while (gb_i < gb_size) {
 		flags = 0;
@@ -210,8 +209,10 @@ void create_mapfiles(const struct Options *opts, struct GBImage *gb,
 		}
 		if (opts->unique) {
 			if (opts->mirror) {
-				index = get_mirrored_tile_index(tile, tiles, num_tiles,
-								tile_size, &flags);
+				index = get_mirrored_tile_index(tile, tiles,
+								num_tiles,
+								tile_size,
+								&flags);
 			} else {
 				index = get_tile_index(tile, tiles, num_tiles,
 						       tile_size);

src/gfx/main.c

@@ -68,7 +68,6 @@ int main(int argc, char *argv[])
 	struct Mapfile tilemap = {0};
 	struct Mapfile attrmap = {0};
 	char *ext;
-	const char *errmsg = "Warning: The PNG's %s setting is not the same as the setting defined on the command line.";
 
 	if (argc == 1)
 		print_usage();
@@ -149,6 +148,10 @@ int main(int argc, char *argv[])
 	if (argc == 0)
 		print_usage();
 
+#define WARN_MISMATCH(property) \
+	warnx("The PNG's " property \
+	      " setting doesn't match the one defined on the command line")
+
 	opts.infile = argv[argc - 1];
 
 	if (depth != 1 && depth != 2)
@@ -164,7 +167,7 @@ int main(int argc, char *argv[])
 
 	if (png_options.horizontal != opts.horizontal) {
 		if (opts.verbose)
-			warnx(errmsg, "horizontal");
+			WARN_MISMATCH("horizontal");
 
 		if (opts.hardfix)
 			png_options.horizontal = opts.horizontal;
@@ -175,7 +178,7 @@ int main(int argc, char *argv[])
 
 	if (png_options.trim != opts.trim) {
 		if (opts.verbose)
-			warnx(errmsg, "trim");
+			WARN_MISMATCH("trim");
 
 		if (opts.hardfix)
 			png_options.trim = opts.trim;
@@ -202,7 +205,7 @@ int main(int argc, char *argv[])
 
 	if (strcmp(png_options.tilemapfile, opts.tilemapfile) != 0) {
 		if (opts.verbose)
-			warnx(errmsg, "tilemap file");
+			WARN_MISMATCH("tilemap file");
 
 		if (opts.hardfix)
 			png_options.tilemapfile = opts.tilemapfile;
@@ -212,7 +215,7 @@ int main(int argc, char *argv[])
 
 	if (png_options.tilemapout != opts.tilemapout) {
 		if (opts.verbose)
-			warnx(errmsg, "tilemap file");
+			WARN_MISMATCH("tilemap file");
 
 		if (opts.hardfix)
 			png_options.tilemapout = opts.tilemapout;
@@ -222,7 +225,7 @@ int main(int argc, char *argv[])
 
 	if (strcmp(png_options.attrmapfile, opts.attrmapfile) != 0) {
 		if (opts.verbose)
-			warnx(errmsg, "attrmap file");
+			WARN_MISMATCH("attrmap file");
 
 		if (opts.hardfix)
 			png_options.attrmapfile = opts.attrmapfile;
@@ -232,7 +235,7 @@ int main(int argc, char *argv[])
 
 	if (png_options.attrmapout != opts.attrmapout) {
 		if (opts.verbose)
-			warnx(errmsg, "attrmap file");
+			WARN_MISMATCH("attrmap file");
 
 		if (opts.hardfix)
 			png_options.attrmapout = opts.attrmapout;
@@ -242,7 +245,7 @@ int main(int argc, char *argv[])
 
 	if (strcmp(png_options.palfile, opts.palfile) != 0) {
 		if (opts.verbose)
-			warnx(errmsg, "palette file");
+			WARN_MISMATCH("palette file");
 
 		if (opts.hardfix)
 			png_options.palfile = opts.palfile;
@@ -252,12 +255,14 @@ int main(int argc, char *argv[])
 
 	if (png_options.palout != opts.palout) {
 		if (opts.verbose)
-			warnx(errmsg, "palette file");
+			WARN_MISMATCH("palette file");
 
 		if (opts.hardfix)
 			png_options.palout = opts.palout;
 	}
 
+#undef WARN_MISMATCH
+
 	if (png_options.palout)
 		opts.palout = png_options.palout;
 

src/gfx/makepng.c

@@ -13,7 +13,7 @@
 
 #include "gfx/main.h"
 
-static void initialize_png(struct PNGImage *img, FILE *f);
+static void initialize_png(struct PNGImage *img, FILE * f);
 static struct RawIndexedImage *indexed_png_to_raw(struct PNGImage *img);
 static struct RawIndexedImage *grayscale_png_to_raw(struct PNGImage *img);
 static struct RawIndexedImage *truecolor_png_to_raw(struct PNGImage *img);

src/link/output.c

@@ -9,7 +9,7 @@
 
 #include "extern/err.h"
 
-FILE *outputFile;
+FILE * outputFile;
 FILE *overlayFile;
 FILE *symFile;
 FILE *mapFile;
@@ -357,9 +357,8 @@ static void writeSymAndMap(void)
 	symFile = openFile(symFileName, "w");
 	mapFile = openFile(mapFileName, "w");
 
-	if (symFileName) {
+	if (symFileName)
 		fputs("; File generated by rgblink\n", symFile);
-	}
 
 	for (uint8_t i = 0; i < SECTTYPE_INVALID; i++) {
 		enum SectionType type = typeMap[i];

src/link/script.c

@@ -11,7 +11,7 @@
 
 #include "extern/err.h"
 
-FILE *linkerScript;
+FILE * linkerScript;
 
 static uint32_t lineNo;