Commit b11384a

nsxivb11384a

code-style: misc changes (#374)

* ensure static variables comes after non-static ones
* remove depreciated DATA32 type
* prefer `sizeof(expression)` over `sizeof(Type)`.
* silence a -Wsign warning
* {gif,webp} loader: use a pointer to reduce code-noise
* gif loader: allocate in one place

Author: NRK
Date: 2022-10-19 14:46 +0200
Parent: aa56aa2
Commit: b11384a6942cdf3c6b6f55e0dcc0a438eff7158a

+51 −57

5 files changed

Browse files Patch

−Context 3+

M image.c +31 −35
M main.c +8 −10
M thumbs.c +1 −1
M util.c +2 −2
M window.c +9 −9

M image.c View

M main.c View

M thumbs.c View

M util.c View

M window.c View

		@@ -23,6 +23,7 @@
23	23
24	24		#include <assert.h>
25	25		#include <errno.h>
	26	+	#include <stdint.h>
26	27		#include <stdlib.h>
27	28		#include <string.h>
28	29		#include <sys/stat.h>
		@@ -92,7 +93,7 @@ void img_init(img_t img, win_t win)
92	93		img_change_gamma(img, options->gamma);
93	94
94	95		img->ss.on = options->slideshow > 0;
95		−	img->ss.delay = options->slideshow > 0 ? options->slideshow : SLIDESHOW_DELAY * 10;
	96	+	img->ss.delay = options->slideshow > 0 ? options->slideshow : SLIDESHOW_DELAY * 10u;
96	97		}
97	98
98	99		#if HAVE_LIBEXIF
		@@ -160,8 +161,8 @@ static bool img_load_gif(img_t img, const fileinfo_t file)
160	161		GifRowType *rows = NULL;
161	162		GifRecordType rec;
162	163		ColorMapObject *cmap;
163		−	DATA32 bgpixel = 0, data, ptr;
164		−	DATA32 *prev_frame = NULL;
	164	+	uint32_t bgpixel = 0, data, ptr;
	165	+	uint32_t *prev_frame = NULL;
165	166		Imlib_Image im;
166	167		int i, j, bg, r, g, b;
167	168		int x, y, w, h, sw, sh;
		@@ -172,13 +173,7 @@ static bool img_load_gif(img_t img, const fileinfo_t file)
172	173		unsigned int disposal = 0, prev_disposal = 0;
173	174		unsigned int delay = 0;
174	175		bool err = false;
175		−
176		−	if (img->multi.cap == 0) {
177		−	img->multi.cap = 8;
178		−	img->multi.frames = emalloc(img->multi.cap * sizeof(img_frame_t));
179		−	}
180		−	img->multi.cnt = img->multi.sel = 0;
181		−	img->multi.length = 0;
	176	+	multi_img_t *m = &img->multi;
182	177
183	178		#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5
184	179		gif = DGifOpenFileName(file->path, NULL);
		@@ -194,6 +189,7 @@ static bool img_load_gif(img_t img, const fileinfo_t file)
194	189		sh = gif->SHeight;
195	190		px = py = pw = ph = 0;
196	191
	192	+	m->length = m->cnt = m->sel = 0;
197	193		do {
198	194		if (DGifGetRecordType(gif, &rec) == GIF_ERROR) {
199	195		err = true;
		@@ -227,9 +223,9 @@ static bool img_load_gif(img_t img, const fileinfo_t file)
227	223		w = gif->Image.Width;
228	224		h = gif->Image.Height;
229	225
230		−	rows = emalloc(h * sizeof(GifRowType));
	226	+	rows = emalloc(h * sizeof(*rows));
231	227		for (i = 0; i < h; i++)
232		−	rows[i] = emalloc(w * sizeof(GifPixelType));
	228	+	rows[i] = emalloc(w * sizeof(*rows[i]));
233	229		if (gif->Image.Interlace) {
234	230		for (i = 0; i < 4; i++) {
235	231		for (j = intoffset[i]; j < h; j += intjump[i])
		@@ -240,7 +236,7 @@ static bool img_load_gif(img_t img, const fileinfo_t file)
240	236		DGifGetLine(gif, rows[i], w);
241	237		}
242	238
243		−	ptr = data = emalloc(sw * sh * sizeof(DATA32));
	239	+	ptr = data = emalloc(sw * sh * sizeof(*data));
244	240		cmap = gif->Image.ColorMap ? gif->Image.ColorMap : gif->SColorMap;
245	241		/* if bg > cmap->ColorCount, it is transparent black already */
246	242		if (cmap && bg >= 0 && bg < cmap->ColorCount) {
		@@ -295,16 +291,16 @@ static bool img_load_gif(img_t img, const fileinfo_t file)
295	291		prev_disposal = disposal;
296	292		px = x, py = y, pw = w, ph = h;
297	293
298		−	if (img->multi.cnt == img->multi.cap) {
299		−	img->multi.cap *= 2;
300		−	img->multi.frames = erealloc(img->multi.frames,
301		−	img->multi.cap * sizeof(img_frame_t));
	294	+	assert(m->cnt <= m->cap);
	295	+	if (m->cnt == m->cap) {
	296	+	m->cap = m->cap == 0 ? 16 : (m->cap * 2);
	297	+	m->frames = erealloc(m->frames, m->cap * sizeof(*m->frames));
302	298		}
303		−	img->multi.frames[img->multi.cnt].im = im;
304		−	delay = img->multi.framedelay > 0 ? img->multi.framedelay : delay;
305		−	img->multi.frames[img->multi.cnt].delay = delay > 0 ? delay : DEF_GIF_DELAY;
306		−	img->multi.length += img->multi.frames[img->multi.cnt].delay;
307		−	img->multi.cnt++;
	299	+	m->frames[m->cnt].im = im;
	300	+	delay = m->framedelay > 0 ? m->framedelay : delay;
	301	+	m->frames[m->cnt].delay = delay > 0 ? delay : DEF_GIF_DELAY;
	302	+	m->length += m->frames[m->cnt].delay;
	303	+	m->cnt++;
308	304		}
309	305		} while (rec != TERMINATE_RECORD_TYPE);
310	306
		@@ -340,6 +336,7 @@ static bool img_load_webp(img_t img, const fileinfo_t file)
340	336		unsigned long flags;
341	337		unsigned int delay;
342	338		bool err = false;
	339	+	multi_img_t *m = &img->multi;
343	340
344	341		if ((webp_file = fopen(file->path, "rb")) == NULL) {
345	342		error(0, errno, "%s: Error opening webp image", file->name);
		@@ -375,28 +372,27 @@ static bool img_load_webp(img_t img, const fileinfo_t file)
375	372		img->w = WebPDemuxGetI(demux, WEBP_FF_CANVAS_WIDTH);
376	373		img->h = WebPDemuxGetI(demux, WEBP_FF_CANVAS_HEIGHT);
377	374
378		−	if (info.frame_count > img->multi.cap) {
379		−	img->multi.cap = info.frame_count;
380		−	img->multi.frames = erealloc(img->multi.frames,
381		−	img->multi.cap * sizeof(img_frame_t));
	375	+	if (info.frame_count > m->cap) {
	376	+	m->cap = info.frame_count;
	377	+	m->frames = erealloc(m->frames, m->cap * sizeof(*m->frames));
382	378		}
383	379
384	380		/* Load and decode frames (also works on images with only 1 frame) */
385		−	img->multi.cnt = img->multi.sel = 0;
	381	+	m->cnt = m->sel = 0;
386	382		while (WebPAnimDecoderGetNext(dec, &buf, &ts)) {
387	383		im = imlib_create_image_using_copied_data(
388		−	info.canvas_width, info.canvas_height, (DATA32*)buf);
	384	+	info.canvas_width, info.canvas_height, (uint32_t *)buf);
389	385		imlib_context_set_image(im);
390	386		imlib_image_set_format("webp");
391	387		/* Get an iterator of this frame - used for frame info (duration, etc.) */
392		−	WebPDemuxGetFrame(demux, img->multi.cnt+1, &iter);
	388	+	WebPDemuxGetFrame(demux, m->cnt+1, &iter);
393	389		imlib_image_set_has_alpha((flags & ALPHA_FLAG) == ALPHA_FLAG);
394	390		/* Store info for this frame */
395		−	img->multi.frames[img->multi.cnt].im = im;
	391	+	m->frames[m->cnt].im = im;
396	392		delay = iter.duration > 0 ? iter.duration : DEF_WEBP_DELAY;
397		−	img->multi.frames[img->multi.cnt].delay = delay;
398		−	img->multi.length += img->multi.frames[img->multi.cnt].delay;
399		−	img->multi.cnt++;
	393	+	m->frames[m->cnt].delay = delay;
	394	+	m->length += m->frames[m->cnt].delay;
	395	+	m->cnt++;
400	396		}
401	397		WebPDemuxReleaseIterator(&iter);
402	398
		@@ -619,8 +615,8 @@ void img_render(img_t *img)
619	615
620	616		if (img->alpha) {
621	617		int i, c, r;
622		−	DATA32 col[2] = { 0xFF666666, 0xFF999999 };
623		−	DATA32 * data = imlib_image_get_data();
	618	+	uint32_t col[2] = { 0xFF666666, 0xFF999999 };
	619	+	uint32_t *data = imlib_image_get_data();
624	620
625	621		for (r = 0; r < dh; r++) {
626	622		i = r * dw;

		@@ -62,17 +62,16 @@ tns_t tns;
62	62		win_t win;
63	63
64	64		appmode_t mode;
65		−	const XButtonEvent *xbutton_ev;
66		−
67	65		fileinfo_t *files;
68	66		int filecnt, fileidx;
69	67		int alternate;
70	68		int markcnt;
71	69		int markidx;
72		−
73	70		int prefix;
74		−	static bool extprefix;
	71	+	bool title_dirty;
	72	+	const XButtonEvent *xbutton_ev;
75	73
	74	+	static bool extprefix;
76	75		static bool resized = false;
77	76
78	77		static struct {
		@@ -90,8 +89,6 @@ static struct {
90	89		extcmd_t f;
91	90		} wintitle;
92	91
93		−	bool title_dirty;
94		−
95	92		static struct {
96	93		timeout_f handler;
97	94		struct timeval when;
		@@ -104,9 +101,10 @@ static struct {
104	101		{ clear_resize },
105	102		};
106	103
107		−	/**************************
108		−	function implementations
109		−	**************************/
	104	+	/*
	105	+	* function implementations
	106	+	*/
	107	+
110	108		static void cleanup(void)
111	109		{
112	110		img_close(&img, false);
		@@ -891,7 +889,7 @@ int main(int argc, char *argv[])
891	889		}
892	890		r_closedir(&dir);
893	891		if (fileidx - start > 1)
894		−	qsort(files + start, fileidx - start, sizeof(fileinfo_t), fncmp);
	892	+	qsort(files + start, fileidx - start, sizeof(*files), fncmp);
895	893		}
896	894		}
897	895

		@@ -145,7 +145,7 @@ void tns_init(tns_t tns, fileinfo_t tns_files, const int cnt, int sel, win_t
145	145		const char homedir, dsuffix = "";
146	146
147	147		if (cnt != NULL && *cnt > 0)
148		−	tns->thumbs = ecalloc(*cnt, sizeof(thumb_t));
	148	+	tns->thumbs = ecalloc(cnt, sizeof(tns->thumbs));
149	149		else
150	150		tns->thumbs = NULL;
151	151		tns->files = tns_files;

		@@ -97,7 +97,7 @@ int r_opendir(r_dir_t rdir, const char dirname, bool recursive)
97	97		}
98	98
99	99		rdir->stcap = 512;
100		−	rdir->stack = emalloc(rdir->stcap * sizeof(char*));
	100	+	rdir->stack = emalloc(rdir->stcap * sizeof(*rdir->stack));
101	101		rdir->stlen = 0;
102	102
103	103		rdir->name = (char*) dirname;
		@@ -164,7 +164,7 @@ char* r_readdir(r_dir_t *rdir, bool skip_dotfiles)
164	164		if (rdir->stlen == rdir->stcap) {
165	165		rdir->stcap *= 2;
166	166		rdir->stack = erealloc(rdir->stack,
167		−	rdir->stcap * sizeof(char*));
	167	+	rdir->stcap * sizeof(*rdir->stack));
168	168		}
169	169		rdir->stack[rdir->stlen++] = filename;
170	170		continue;

		@@ -34,14 +34,11 @@
34	34		#if HAVE_LIBFONTS
35	35		#include "utf8.h"
36	36		#define UTF8_PADDING 4 /* utf8_decode requires 4 bytes of zero padding */
37		−	static XftFont *font;
38		−	static double fontsize;
39	37		#define TEXTWIDTH(win, text, len) \
40	38		win_draw_text(win, NULL, NULL, 0, 0, text, len, 0)
41	39		#endif
42	40
43	41		#define RES_CLASS "Nsxiv"
44		−
45	42		#define INIT_ATOM_(atom) \
46	43		atoms[ATOM_##atom] = XInternAtom(e->dpy, #atom, False);
47	44
		@@ -50,6 +47,10 @@ enum {
50	47		V_TEXT_PAD = 1
51	48		};
52	49
	50	+	Atom atoms[ATOM_COUNT];
	51	+
	52	+	static GC gc;
	53	+	static int barheight;
53	54		static struct {
54	55		int name;
55	56		Cursor icon;
		@@ -58,11 +59,10 @@ static struct {
58	59		{ XC_sb_left_arrow }, { XC_sb_right_arrow }
59	60		};
60	61
61		−	static GC gc;
62		−
63		−	static int barheight;
64		−
65		−	Atom atoms[ATOM_COUNT];
	62	+	#if HAVE_LIBFONTS
	63	+	static XftFont *font;
	64	+	static double fontsize;
	65	+	#endif
66	66
67	67		#if HAVE_LIBFONTS
68	68		static void win_init_font(const win_env_t e, const char fontstr)
		@@ -116,7 +116,7 @@ void win_init(win_t *win)
116	116		static char lbuf[512 + UTF8_PADDING], rbuf[64 + UTF8_PADDING];
117	117		#endif
118	118
119		−	memset(win, 0, sizeof(win_t));
	119	+	memset(win, 0, sizeof(*win));
120	120
121	121		e = &win->env;
122	122		if ((e->dpy = XOpenDisplay(NULL)) == NULL)

nsxiv/b11384a

code-style: misc changes (#374)

nsxivb11384a