Commit 447e9a7c authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty/vt: consolemap: saner variable names in con_release_unimap() 



The function uses too vague variable names like i, j, k for iterators, p,
q, p1, p2 for pointers etc.

Rename all these, so that it is clear what is going on:
- dict: for dictionaries.
- d, r, g: for dir, row, glyph iterators -- these are unsigned now.
- dir, row: for directory and row pointers.
- glyph: for the glyph.
- and so on...

This is a lot of shuffling, but the result pays off, IMO.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220607104946.18710-26-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cded789c

drivers/tty/vt/consolemap.c

+18 −16
Original line number Diff line number Diff line
@@ -415,28 +415,30 @@ int con_get_trans_new(ushort __user * arg) 
extern u8 dfont_unicount[];	/* Defined in console_defmap.c */

extern u16 dfont_unitable[];



static void con_release_unimap(struct uni_pagedict *p)

static void con_release_unimap(struct uni_pagedict *dict)

{

	u16 **p1;

	int i, j;

	unsigned int d, r;



	if (p == dflt)

	if (dict == dflt)

		dflt = NULL;

	for (i = 0; i < UNI_DIRS; i++) {

		p1 = p->uni_pgdir[i];

		if (p1 != NULL) {

			for (j = 0; j < UNI_DIR_ROWS; j++)

				kfree(p1[j]);

			kfree(p1);



	for (d = 0; d < UNI_DIRS; d++) {

		u16 **dir = dict->uni_pgdir[d];

		if (dir != NULL) {

			for (r = 0; r < UNI_DIR_ROWS; r++)

				kfree(dir[r]);

			kfree(dir);

		}

		p->uni_pgdir[i] = NULL;

		dict->uni_pgdir[d] = NULL;

	}

	for (i = 0; i < ARRAY_SIZE(p->inverse_translations); i++) {

		kfree(p->inverse_translations[i]);

		p->inverse_translations[i] = NULL;



	for (r = 0; r < ARRAY_SIZE(dict->inverse_translations); r++) {

		kfree(dict->inverse_translations[r]);

		dict->inverse_translations[r] = NULL;

	}

	kfree(p->inverse_trans_unicode);

	p->inverse_trans_unicode = NULL;



	kfree(dict->inverse_trans_unicode);

	dict->inverse_trans_unicode = NULL;

}



/* Caller must hold the console lock */