gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-22 11:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some make checkcodebase errors

Browse Source 
- Reorder checkpatch ignore flags alphabetically
- Fix checkpatch WARNINGs and CHECKs when they make sense
- Add more checkpatch ignores
This commit is contained in:
ISSOtm
2019-12-04 00:16:28 +01:00
parent a290e19f46
commit 2d7d9eef9f
14 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gfx/gb.c
View File

@@ -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);

23
src/gfx/main.c
View File

@@ -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;

2
src/gfx/makepng.c
View File

@@ -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);