iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vt: declare xy for get/putconsxy properly

Browse Source 
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: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200818085706.12163-2-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2020-08-18 10:56:52 +02:00 committed by Greg Kroah-Hartman
parent d73568c4cc
commit a5c6bd806d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/tty/vt/vt.c
View File

@ -4769,17 +4769,17 @@ unsigned short *screen_pos(const struct vc_data *vc, int w_offset, int viewed)
} }
EXPORT_SYMBOL_GPL(screen_pos); 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 */ /* clamp values if they don't fit */
p[0] = min(vc->state.x, 0xFFu); xy[0] = min(vc->state.x, 0xFFu);
p[1] = min(vc->state.y, 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); hide_cursor(vc);
gotoxy(vc, p[0], p[1]); gotoxy(vc, xy[0], xy[1]);
set_cursor(vc); set_cursor(vc);
} }

4
include/linux/selection.h
View File

@ -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 complement_pos(struct vc_data *vc, int offset);
extern void invert_screen(struct vc_data *vc, int offset, int count, int shift); 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 getconsxy(const struct vc_data *vc, unsigned char xy[static 2]);
extern void putconsxy(struct vc_data *vc, unsigned char *p); 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 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); extern void vcs_scr_writew(struct vc_data *vc, u16 val, u16 *org);