Commit 1a086f5d authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty/vt: consolemap: saner variable names in con_set_default_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-30-jslaby@suse.cz


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

drivers/tty/vt/consolemap.c

+22 −21
Original line number Diff line number Diff line
@@ -694,20 +694,21 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list) 
 */

int con_set_default_unimap(struct vc_data *vc)

{

	int i, j, err = 0, err1;

	u16 *q;

	struct uni_pagedict *p;

	struct uni_pagedict *dict;

	unsigned int fontpos, count;

	int err = 0, err1;

	u16 *dfont;



	if (dflt) {

		p = *vc->vc_uni_pagedir_loc;

		if (p == dflt)

		dict = *vc->vc_uni_pagedir_loc;

		if (dict == dflt)

			return 0;



		dflt->refcount++;

		*vc->vc_uni_pagedir_loc = dflt;

		if (p && !--p->refcount) {

			con_release_unimap(p);

			kfree(p);

		if (dict && !--dict->refcount) {

			con_release_unimap(dict);

			kfree(dict);

		}

		return 0;

	}
@@ -718,25 +719,25 @@ int con_set_default_unimap(struct vc_data *vc) 
	if (err)

		return err;



	p = *vc->vc_uni_pagedir_loc;

	q = dfont_unitable;

	dict = *vc->vc_uni_pagedir_loc;

	dfont = dfont_unitable;



	for (i = 0; i < 256; i++)

		for (j = dfont_unicount[i]; j; j--) {

			err1 = con_insert_unipair(p, *(q++), i);

	for (fontpos = 0; fontpos < 256U; fontpos++)

		for (count = dfont_unicount[fontpos]; count; count--) {

			err1 = con_insert_unipair(dict, *(dfont++), fontpos);

			if (err1)

				err = err1;

		}



	if (con_unify_unimap(vc, p)) {

	if (con_unify_unimap(vc, dict)) {

		dflt = *vc->vc_uni_pagedir_loc;

		return err;

	}



	for (enum translation_map m = FIRST_MAP; m <= LAST_MAP; m++)

		set_inverse_transl(vc, p, m);	/* Update all inverse translations */

	set_inverse_trans_unicode(vc, p);

	dflt = p;

		set_inverse_transl(vc, dict, m);

	set_inverse_trans_unicode(vc, dict);

	dflt = dict;

	return err;

}

EXPORT_SYMBOL(con_set_default_unimap);