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

vt: declare xy for get/putconsxy properly 



That is:
1) call the parameter 'xy' to denote what it really is, not generic 'p'
2) tell the compiler and users that we expect an array:
   * with at least 2 chars (static 2)
   * which we don't modify in putconsxy (const)

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


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

drivers/tty/vt/vt.c

+5 −5
Original line number Diff line number Diff line
@@ -4769,17 +4769,17 @@ unsigned short *screen_pos(const struct vc_data *vc, int w_offset, int viewed) 
}

EXPORT_SYMBOL_GPL(screen_pos);



void getconsxy(const struct vc_data *vc, unsigned char *p)

void getconsxy(const struct vc_data *vc, unsigned char xy[static 2])

{

	/* clamp values if they don't fit */

	p[0] = min(vc->state.x, 0xFFu);

	p[1] = min(vc->state.y, 0xFFu);

	xy[0] = min(vc->state.x, 0xFFu);

	xy[1] = min(vc->state.y, 0xFFu);

}



void putconsxy(struct vc_data *vc, unsigned char *p)

void putconsxy(struct vc_data *vc, unsigned char xy[static const 2])

{

	hide_cursor(vc);

	gotoxy(vc, p[0], p[1]);

	gotoxy(vc, xy[0], xy[1]);

	set_cursor(vc);

}

include/linux/selection.h

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ extern u32 screen_glyph_unicode(const struct vc_data *vc, int offset); 
extern void complement_pos(struct vc_data *vc, int offset);

extern void invert_screen(struct vc_data *vc, int offset, int count, int shift);



extern void getconsxy(const struct vc_data *vc, unsigned char *p);

extern void putconsxy(struct vc_data *vc, unsigned char *p);

extern void getconsxy(const struct vc_data *vc, unsigned char xy[static 2]);

extern void putconsxy(struct vc_data *vc, unsigned char xy[static const 2]);



extern u16 vcs_scr_readw(const struct vc_data *vc, const u16 *org);

extern void vcs_scr_writew(struct vc_data *vc, u16 val, u16 *org);

CRA Git | Maintained and supported by SUSTech CRA and CCSE