Commit ca2beaf8 authored by Samuel Thibault's avatar Samuel Thibault Committed by Greg Kroah-Hartman
Browse files

staging: speakup: Prefix externally-visible symbols 



This prefixes all externally-visible symbols of speakup with "spk_".

Signed-off-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a129be84

drivers/staging/speakup/i18n.c

+6 −6
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static struct msg_group_t all_groups[] = { 


static const  int num_groups = sizeof(all_groups) / sizeof(struct msg_group_t);



char *msg_get(enum msg_index_t index)

char *spk_msg_get(enum msg_index_t index)

{

	char *ch;
@@ -540,7 +540,7 @@ static int fmt_validate(char *template, char *user) 
 * -EINVAL -  Invalid format specifiers in formatted message or illegal index.

 * -ENOMEM -  Unable to allocate memory.

*/

ssize_t msg_set(enum msg_index_t index, char *text, size_t length)

ssize_t spk_msg_set(enum msg_index_t index, char *text, size_t length)

{

	int rc = 0;

	char *newstr = NULL;
@@ -576,7 +576,7 @@ ssize_t msg_set(enum msg_index_t index, char *text, size_t length) 
 * Find a message group, given its name.  Return a pointer to the structure

 * if found, or NULL otherwise.

*/

struct msg_group_t *find_msg_group(const char *group_name)

struct msg_group_t *spk_find_msg_group(const char *group_name)

{

	struct msg_group_t *group = NULL;

	int i;
@@ -590,7 +590,7 @@ struct msg_group_t *find_msg_group(const char *group_name) 
	return group;

}



void reset_msg_group(struct msg_group_t *group)

void spk_reset_msg_group(struct msg_group_t *group)

{

	unsigned long flags;

	enum msg_index_t i;
@@ -606,14 +606,14 @@ void reset_msg_group(struct msg_group_t *group) 
}



/* Called at initialization time, to establish default messages. */

void initialize_msgs(void)

void spk_initialize_msgs(void)

{

	memcpy(speakup_msgs, speakup_default_msgs,

		sizeof(speakup_default_msgs));

}



/* Free user-supplied strings when module is unloaded: */

void free_user_msgs(void)

void spk_free_user_msgs(void)

{

	enum msg_index_t index;

	unsigned long flags;

drivers/staging/speakup/i18n.h

+6 −6
Original line number Diff line number Diff line
@@ -218,11 +218,11 @@ struct msg_group_t { 
	enum msg_index_t end;

};



extern char *msg_get(enum msg_index_t index);

extern ssize_t msg_set(enum msg_index_t index, char *text, size_t length);

extern struct msg_group_t *find_msg_group(const char *group_name);

extern void reset_msg_group(struct msg_group_t *group);

extern void initialize_msgs(void);

extern void free_user_msgs(void);

extern char *spk_msg_get(enum msg_index_t index);

extern ssize_t spk_msg_set(enum msg_index_t index, char *text, size_t length);

extern struct msg_group_t *spk_find_msg_group(const char *group_name);

extern void spk_reset_msg_group(struct msg_group_t *group);

extern void spk_initialize_msgs(void);

extern void spk_free_user_msgs(void);



#endif

drivers/staging/speakup/keyhelp.c

+18 −18
Original line number Diff line number Diff line
@@ -115,10 +115,10 @@ static void say_key(int key) 
	key &= 0xff;

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

		if (state & masks[i])

			synth_printf(" %s", msg_get(MSG_STATES_START + i));

			synth_printf(" %s", spk_msg_get(MSG_STATES_START + i));

	}

	if ((key > 0) && (key <= num_key_names))

		synth_printf(" %s\n", msg_get(MSG_KEYNAMES_START + (key - 1)));

		synth_printf(" %s\n", spk_msg_get(MSG_KEYNAMES_START + (key - 1)));

}



static int help_init(void)
@@ -126,9 +126,9 @@ static int help_init(void) 
	char start = SPACE;

	int i;

	int num_funcs = MSG_FUNCNAMES_END - MSG_FUNCNAMES_START + 1;

state_tbl = our_keys[0]+SHIFT_TBL_SIZE+2;

state_tbl = spk_our_keys[0]+SHIFT_TBL_SIZE+2;

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

		char *cur_funcname = msg_get(MSG_FUNCNAMES_START + i);

		char *cur_funcname = spk_msg_get(MSG_FUNCNAMES_START + i);

		if (start == *cur_funcname)

			continue;

		start = *cur_funcname;
@@ -137,7 +137,7 @@ state_tbl = our_keys[0]+SHIFT_TBL_SIZE+2; 
	return 0;

}



int handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)

int spk_handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)

{

	int i, n;

	char *name;
@@ -147,15 +147,15 @@ int handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key) 
		help_init();

	if (type == KT_LATIN) {

		if (ch == SPACE) {

			special_handler = NULL;

			synth_printf("%s\n", msg_get(MSG_LEAVING_HELP));

			spk_special_handler = NULL;

			synth_printf("%s\n", spk_msg_get(MSG_LEAVING_HELP));

			return 1;

		}

		ch |= 32; /* lower case */

		if (ch < 'a' || ch > 'z')

			return -1;

		if (letter_offsets[ch-'a'] == -1) {

			synth_printf(msg_get(MSG_NO_COMMAND), ch);

			synth_printf(spk_msg_get(MSG_NO_COMMAND), ch);

			synth_printf("\n");

			return 1;

		}
@@ -169,47 +169,47 @@ int handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key) 
			cur_item--;

		else

			return -1;

	} else if (type == KT_SPKUP && ch == SPEAKUP_HELP && !special_handler) {

		special_handler = handle_help;

		synth_printf("%s\n", msg_get(MSG_HELP_INFO));

	} else if (type == KT_SPKUP && ch == SPEAKUP_HELP && !spk_special_handler) {

		spk_special_handler = spk_handle_help;

		synth_printf("%s\n", spk_msg_get(MSG_HELP_INFO));

		build_key_data(); /* rebuild each time in case new mapping */

		return 1;

	} else {

		name = NULL;

		if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) {

			synth_printf("%s\n",

				msg_get(MSG_KEYNAMES_START + key-1));

				spk_msg_get(MSG_KEYNAMES_START + key-1));

			return 1;

		}

		for (i = 0; funcvals[i] != 0 && !name; i++) {

			if (ch == funcvals[i])

				name = msg_get(MSG_FUNCNAMES_START + i);

				name = spk_msg_get(MSG_FUNCNAMES_START + i);

		}

		if (!name)

			return -1;

		kp = our_keys[key]+1;

		kp = spk_our_keys[key]+1;

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

			if (ch == kp[i])

				break;

		}

		key += (state_tbl[i] << 8);

		say_key(key);

		synth_printf(msg_get(MSG_KEYDESC), name);

		synth_printf(spk_msg_get(MSG_KEYDESC), name);

		synth_printf("\n");

		return 1;

	}

	name = msg_get(MSG_FUNCNAMES_START + cur_item);

	name = spk_msg_get(MSG_FUNCNAMES_START + cur_item);

	func = funcvals[cur_item];

	synth_printf("%s", name);

	if (key_offsets[func] == 0) {

		synth_printf(" %s\n", msg_get(MSG_IS_UNASSIGNED));

		synth_printf(" %s\n", spk_msg_get(MSG_IS_UNASSIGNED));

		return 1;

	}

	p_keys = key_data + key_offsets[func];

	for (n = 0; p_keys[n]; n++) {

		val = p_keys[n];

		if (n > 0)

			synth_printf("%s ", msg_get(MSG_DISJUNCTION));

			synth_printf("%s ", spk_msg_get(MSG_DISJUNCTION));

		say_key(val);

	}

	return 1;

drivers/staging/speakup/kobjects.c

+40 −40
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static ssize_t chars_chartab_show(struct kobject *kobj, 
			break;

		if (strcmp("characters", attr->attr.name) == 0) {

			len = scnprintf(buf_pointer, bufsize, "%d\t%s\n",

					i, characters[i]);

					i, spk_characters[i]);

		} else {	/* show chartab entry */

			if (IS_TYPE(i, B_CTL))

				cp = "B_CTL";
@@ -185,12 +185,12 @@ static ssize_t chars_chartab_store(struct kobject *kobj, 
		outptr[desc_length] = '\0';



		if (do_characters) {

			if (characters[index] != default_chars[index])

				kfree(characters[index]);

			characters[index] = desc;

			if (spk_characters[index] != spk_default_chars[index])

				kfree(spk_characters[index]);

			spk_characters[index] = desc;

			used++;

		} else {

			charclass = chartab_get_value(keyword);

			charclass = spk_chartab_get_value(keyword);

			if (charclass == 0) {

				rejected++;

				cp = linefeed + 1;
@@ -206,9 +206,9 @@ static ssize_t chars_chartab_store(struct kobject *kobj, 


	if (reset) {

		if (do_characters)

			reset_default_chars();

			spk_reset_default_chars();

		else

			reset_default_chartab();

			spk_reset_default_chartab();

	}



	spk_unlock(flags);
@@ -232,7 +232,7 @@ static ssize_t keymap_show(struct kobject *kobj, struct kobj_attribute *attr, 
	u_char ch;

	unsigned long flags;

	spk_lock(flags);

	cp1 = key_buf + SHIFT_TBL_SIZE;

	cp1 = spk_key_buf + SHIFT_TBL_SIZE;

	num_keys = (int)(*cp1);

	nstates = (int)cp1[1];

	cp += sprintf(cp, "%d, %d, %d,\n", KEY_MAP_VER, num_keys, nstates);
@@ -271,7 +271,7 @@ static ssize_t keymap_store(struct kobject *kobj, struct kobj_attribute *attr, 
		return -ENOMEM;

	}

	if (strchr("dDrR", *in_buff)) {

		set_key_info(key_defaults, key_buf);

		spk_set_key_info(spk_key_defaults, spk_key_buf);

		pr_info("keymap set to default values\n");

		kfree(in_buff);

		spk_unlock(flags);
@@ -282,14 +282,14 @@ static ssize_t keymap_store(struct kobject *kobj, struct kobj_attribute *attr, 
	cp = in_buff;

	cp1 = (u_char *)in_buff;

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

		cp = s2uchar(cp, cp1);

		cp = spk_s2uchar(cp, cp1);

		cp1++;

	}

	i = (int)cp1[-2]+1;

	i *= (int)cp1[-1]+1;

	i += 2; /* 0 and last map ver */

	if (cp1[-3] != KEY_MAP_VER || cp1[-1] > 10 ||

			i+SHIFT_TBL_SIZE+4 >= sizeof(key_buf)) {

			i+SHIFT_TBL_SIZE+4 >= sizeof(spk_key_buf)) {

		pr_warn("i %d %d %d %d\n", i,

				(int)cp1[-3], (int)cp1[-2], (int)cp1[-1]);

		kfree(in_buff);
@@ -297,7 +297,7 @@ static ssize_t keymap_store(struct kobject *kobj, struct kobj_attribute *attr, 
		return -EINVAL;

	}

	while (--i >= 0) {

		cp = s2uchar(cp, cp1);

		cp = spk_s2uchar(cp, cp1);

		cp1++;

		if (!(*cp))

			break;
@@ -307,8 +307,8 @@ static ssize_t keymap_store(struct kobject *kobj, struct kobj_attribute *attr, 
		pr_warn("end %d %d %d %d\n", i,

				(int)cp1[-3], (int)cp1[-2], (int)cp1[-1]);

	} else {

		if (set_key_info(in_buff, key_buf)) {

			set_key_info(key_defaults, key_buf);

		if (spk_set_key_info(in_buff, spk_key_buf)) {

			spk_set_key_info(spk_key_defaults, spk_key_buf);

			ret = -EINVAL;

			pr_warn("set key failed\n");

		}
@@ -343,7 +343,7 @@ static ssize_t silent_store(struct kobject *kobj, struct kobj_attribute *attr, 
	spk_lock(flags);

	if (ch&2) {

		shut = 1;

		do_flush();

		spk_do_flush();

	} else {

		shut = 0;

	}
@@ -388,7 +388,7 @@ static ssize_t synth_store(struct kobject *kobj, struct kobj_attribute *attr, 
	if (new_synth_name[len - 1] == '\n')

		len--;

	new_synth_name[len] = '\0';

	strlwr(new_synth_name);

	spk_strlwr(new_synth_name);

	if ((synth != NULL) && (!strcmp(new_synth_name, synth->name))) {

		pr_warn("%s already in use\n", new_synth_name);

	} else if (synth_init(new_synth_name) != 0) {
@@ -417,7 +417,7 @@ static ssize_t synth_direct_store(struct kobject *kobj, 
		bytes = min_t(size_t, len, 250);

		strncpy(tmp, ptr, bytes);

		tmp[bytes] = '\0';

		xlate(tmp);

		spk_xlate(tmp);

		synth_printf("%s", tmp);

		ptr += bytes;

		len -= bytes;
@@ -455,14 +455,14 @@ static ssize_t punc_show(struct kobject *kobj, struct kobj_attribute *attr, 
	short mask;

	unsigned long flags;



	p_header = var_header_by_name(attr->attr.name);

	p_header = spk_var_header_by_name(attr->attr.name);

	if (p_header == NULL) {

		pr_warn("p_header is null, attr->attr.name is %s\n",

			attr->attr.name);

		return -EINVAL;

	}



	var = get_punc_var(p_header->var_id);

	var = spk_get_punc_var(p_header->var_id);

	if (var == NULL) {

		pr_warn("var is null, p_header->var_id is %i\n",

				p_header->var_id);
@@ -470,7 +470,7 @@ static ssize_t punc_show(struct kobject *kobj, struct kobj_attribute *attr, 
	}



	spk_lock(flags);

	pb = (struct st_bits_data *) &punc_info[var->value];

	pb = (struct st_bits_data *) &spk_punc_info[var->value];

	mask = pb->mask;

	for (i = 33; i < 128; i++) {

		if (!(spk_chartab[i]&mask))
@@ -497,14 +497,14 @@ static ssize_t punc_store(struct kobject *kobj, struct kobj_attribute *attr, 
	if (x < 1 || x > 99)

		return -EINVAL;



	p_header = var_header_by_name(attr->attr.name);

	p_header = spk_var_header_by_name(attr->attr.name);

	if (p_header == NULL) {

		pr_warn("p_header is null, attr->attr.name is %s\n",

			attr->attr.name);

		return -EINVAL;

	}



	var = get_punc_var(p_header->var_id);

	var = spk_get_punc_var(p_header->var_id);

	if (var == NULL) {

		pr_warn("var is null, p_header->var_id is %i\n",

				p_header->var_id);
@@ -520,9 +520,9 @@ static ssize_t punc_store(struct kobject *kobj, struct kobj_attribute *attr, 
	spk_lock(flags);



	if (*punc_buf == 'd' || *punc_buf == 'r')

		x = set_mask_bits(0, var->value, 3);

		x = spk_set_mask_bits(0, var->value, 3);

	else

		x = set_mask_bits(punc_buf, var->value, 3);

		x = spk_set_mask_bits(punc_buf, var->value, 3);



	spk_unlock(flags);

	return count;
@@ -542,7 +542,7 @@ ssize_t spk_var_show(struct kobject *kobj, struct kobj_attribute *attr, 
	char ch;

	unsigned long flags;



	param = var_header_by_name(attr->attr.name);

	param = spk_var_header_by_name(attr->attr.name);

	if (param == NULL)

		return -EINVAL;
@@ -599,13 +599,13 @@ ssize_t spk_var_store(struct kobject *kobj, struct kobj_attribute *attr, 
	int value;

	unsigned long flags;



	param = var_header_by_name(attr->attr.name);

	param = spk_var_header_by_name(attr->attr.name);

	if (param == NULL)

		return -EINVAL;

	if (param->data == NULL)

		return 0;

	ret = 0;

	cp = xlate((char *) buf);

	cp = spk_xlate((char *) buf);



	spk_lock(flags);

	switch (param->var_type) {
@@ -618,7 +618,7 @@ ssize_t spk_var_store(struct kobject *kobj, struct kobj_attribute *attr, 
		else

			len = E_SET;

		speakup_s2i(cp, &value);

		ret = set_num_var(value, param, len);

		ret = spk_set_num_var(value, param, len);

		if (ret == E_RANGE) {

			var_data = param->data;

			pr_warn("value for %s out of range, expect %d to %d\n",
@@ -636,7 +636,7 @@ ssize_t spk_var_store(struct kobject *kobj, struct kobj_attribute *attr, 
		}

		cp = (char *) buf;

		cp[len] = '\0';

		ret = set_string_var(buf, param, len);

		ret = spk_set_string_var(buf, param, len);

		if (ret == E_TOOLONG)

			pr_warn("value too long for %s\n",

					attr->attr.name);
@@ -652,19 +652,19 @@ ssize_t spk_var_store(struct kobject *kobj, struct kobj_attribute *attr, 
	 */

	if (strcmp(attr->attr.name, "voice") == 0) {

		if (synth && synth->default_pitch) {

			param = var_header_by_name("pitch");

			param = spk_var_header_by_name("pitch");

			if (param)  {

				set_num_var(synth->default_pitch[value], param,

				spk_set_num_var(synth->default_pitch[value], param,

					E_NEW_DEFAULT);

				set_num_var(0, param, E_DEFAULT);

				spk_set_num_var(0, param, E_DEFAULT);

			}

		}

		if (synth && synth->default_vol) {

			param = var_header_by_name("vol");

			param = spk_var_header_by_name("vol");

			if (param)  {

				set_num_var(synth->default_vol[value], param,

				spk_set_num_var(synth->default_vol[value], param,

					E_NEW_DEFAULT);

				set_num_var(0, param, E_DEFAULT);

				spk_set_num_var(0, param, E_DEFAULT);

			}

		}

	}
@@ -694,7 +694,7 @@ static ssize_t message_show_helper(char *buf, enum msg_index_t first, 
		if (bufsize <= 1)

			break;

		printed = scnprintf(buf_pointer, bufsize, "%d\t%s\n",

			index, msg_get(cursor));

			index, spk_msg_get(cursor));

		buf_pointer += printed;

		bufsize -= printed;

	}
@@ -788,7 +788,7 @@ static ssize_t message_store_helper(const char *buf, size_t count, 
			continue;

		}



		msg_stored = msg_set(curmessage, temp, desc_length);

		msg_stored = spk_msg_set(curmessage, temp, desc_length);

		if (msg_stored < 0) {

			retval = msg_stored;

			if (msg_stored == -ENOMEM)
@@ -802,7 +802,7 @@ static ssize_t message_store_helper(const char *buf, size_t count, 
	}



	if (reset)

		reset_msg_group(group);

		spk_reset_msg_group(group);



	report_msg_status(reset, received, used, rejected, group->name);

	return retval;
@@ -812,7 +812,7 @@ static ssize_t message_show(struct kobject *kobj, 
	struct kobj_attribute *attr, char *buf)

{

	ssize_t retval = 0;

	struct msg_group_t *group = find_msg_group(attr->attr.name);

	struct msg_group_t *group = spk_find_msg_group(attr->attr.name);

	unsigned long flags;



	BUG_ON(!group);
@@ -826,7 +826,7 @@ static ssize_t message_store(struct kobject *kobj, struct kobj_attribute *attr, 
	const char *buf, size_t count)

{

	ssize_t retval = 0;

	struct msg_group_t *group = find_msg_group(attr->attr.name);

	struct msg_group_t *group = spk_find_msg_group(attr->attr.name);



	BUG_ON(!group);

	retval = message_store_helper(buf, count, group);

drivers/staging/speakup/main.c

+183 −183

File changed.

Preview size limit exceeded, changes collapsed.