kyonshi/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-04-30 04:41:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: use return value instead of char_data param in perform_complex_alias()

Browse Source 
Agent-Logs-Url: https://github.com/tbamud/tbamud/sessions/0234b743-60ca-4c94-b467-0b9310cd8e44

Co-authored-by: welcor <357770+welcor@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-25 14:52:27 +00:00
committed by GitHub
parent 96dfc6fb09
commit 8b6c38bb20
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/interpreter.c
View File

@@ -41,7 +41,7 @@
/* local (file scope) functions */ /* local (file scope) functions */
static int perform_dupe_check(struct descriptor_data *d); static int perform_dupe_check(struct descriptor_data *d);
static struct alias_data *find_alias(struct alias_data *alias_list, char *str); static struct alias_data *find_alias(struct alias_data *alias_list, char *str);
static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alias_data *a, struct char_data *ch); static int perform_complex_alias(struct txt_q *input_q, char *orig, struct alias_data *a);
static int _parse_name(char *arg, char *name); static int _parse_name(char *arg, char *name);
static bool perform_new_char_dupe_check(struct descriptor_data *d); static bool perform_new_char_dupe_check(struct descriptor_data *d);
/* sort_commands utility */ /* sort_commands utility */
@@ -668,7 +668,7 @@ ACMD(do_alias)
* commands. */ * commands. */
#define NUM_TOKENS 9 #define NUM_TOKENS 9
static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alias_data *a, struct char_data *ch) static int perform_complex_alias(struct txt_q *input_q, char *orig, struct alias_data *a)
{ {
struct txt_q temp_queue; struct txt_q temp_queue;
struct txt_block *qtmp; struct txt_block *qtmp;
@@ -732,16 +732,16 @@ static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alia
temp_queue.tail->next = input_q->head; temp_queue.tail->next = input_q->head;
input_q->head = temp_queue.head; input_q->head = temp_queue.head;
} }
return; return (0);
overflow: overflow:
send_to_char(ch, "Alias expansion too long.\r\n");
while (temp_queue.head) { while (temp_queue.head) {
qtmp = temp_queue.head; qtmp = temp_queue.head;
temp_queue.head = qtmp->next; temp_queue.head = qtmp->next;
free(qtmp->text); free(qtmp->text);
free(qtmp); free(qtmp);
} }
return (-1);
} }
/* Given a character and a string, perform alias replacement on it. /* Given a character and a string, perform alias replacement on it.
@@ -777,7 +777,8 @@ int perform_alias(struct descriptor_data *d, char *orig, size_t maxlen)
strlcpy(orig, a->replacement, maxlen); strlcpy(orig, a->replacement, maxlen);
return (0); return (0);
} else { } else {
perform_complex_alias(&d->input, ptr, a, d->character); if (perform_complex_alias(&d->input, ptr, a) < 0)
send_to_char(d->character, "Alias expansion too long.\r\n");
return (1); return (1);
} }
} }