devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-24 12:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate code in autocomplete_param*

Browse Source 
autocomplete_param_with_func and -autocomplete_param_with_ac had lots of
duplicate code.
This commit is contained in:
Michael Vetter
2021-03-11 22:08:04 +01:00
parent 7e6b9f4e0a
commit c1ccaee58f
1 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/tools/autocomplete.c
View File

@@ -298,53 +298,34 @@ autocomplete_complete(Autocomplete ac, const gchar* search_str, gboolean quote,
} }
} }
char* // autocomplete_func func is used -> autocomplete_param_with_func
autocomplete_param_with_func(const char* const input, char* command, autocomplete_func func, gboolean previous, void* context) // Autocomplete ac, gboolean quote are used -> autocomplete_param_with_ac
{ static char*
GString* auto_msg = NULL; _autocomplete_param_common(const char* const input, char* command, autocomplete_func func, Autocomplete ac, gboolean quote, gboolean previous, void* context)
char* result = NULL;
char command_cpy[strlen(command) + 2];
sprintf(command_cpy, "%s ", command);
int len = strlen(command_cpy);
if (strncmp(input, command_cpy, len) == 0) {
int inp_len = strlen(input);
char prefix[inp_len];
for (int i = len; i < inp_len; i++) {
prefix[i - len] = input[i];
}
prefix[inp_len - len] = '\0';
char* found = func(prefix, previous, context);
if (found) {
auto_msg = g_string_new(command_cpy);
g_string_append(auto_msg, found);
free(found);
result = auto_msg->str;
g_string_free(auto_msg, FALSE);
}
}
return result;
}
char*
autocomplete_param_with_ac(const char* const input, char* command, Autocomplete ac, gboolean quote, gboolean previous)
{ {
GString* auto_msg = NULL; GString* auto_msg = NULL;
char* result = NULL; char* result = NULL;
char* command_cpy = malloc(strlen(command) + 2); char* command_cpy = malloc(strlen(command) + 2);
sprintf(command_cpy, "%s ", command); sprintf(command_cpy, "%s ", command);
int len = strlen(command_cpy); int len = strlen(command_cpy);
int inp_len = strlen(input);
if (strncmp(input, command_cpy, len) == 0) { if (strncmp(input, command_cpy, len) == 0) {
int inp_len = strlen(input);
char prefix[inp_len]; char prefix[inp_len];
char *found;
for (int i = len; i < inp_len; i++) { for (int i = len; i < inp_len; i++) {
prefix[i - len] = input[i]; prefix[i - len] = input[i];
} }
prefix[inp_len - len] = '\0'; prefix[inp_len - len] = '\0';
char* found = autocomplete_complete(ac, prefix, quote, previous); if (func) {
found = func(prefix, previous, context);
} else {
found = autocomplete_complete(ac, prefix, quote, previous);
}
if (found) { if (found) {
auto_msg = g_string_new(command_cpy); auto_msg = g_string_new(command_cpy);
g_string_append(auto_msg, found); g_string_append(auto_msg, found);
@@ -358,6 +339,18 @@ autocomplete_param_with_ac(const char* const input, char* command, Autocomplete
return result; return result;
} }
char*
autocomplete_param_with_func(const char* const input, char* command, autocomplete_func func, gboolean previous, void* context)
{
return _autocomplete_param_common(input, command, func, NULL, FALSE, previous, context);
}
char*
autocomplete_param_with_ac(const char* const input, char* command, Autocomplete ac, gboolean quote, gboolean previous)
{
return _autocomplete_param_common(input, command, NULL, ac, quote, previous, NULL);
}
char* char*
autocomplete_param_no_with_func(const char* const input, char* command, int arg_number, autocomplete_func func, gboolean previous, void* context) autocomplete_param_no_with_func(const char* const input, char* command, int arg_number, autocomplete_func func, gboolean previous, void* context)
{ {