X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fcommand_db.c;h=f5670a8f207b9638ce420e0775afb5aa492ccfd5;hb=a053b626309d3d9c51caecf35a018b6e1df5ecb5;hp=699eb468217dacf912a03b991014a67d53fc474a;hpb=a8097b8fef09444ebac0f1e2d3ffc4e621557b28;p=plomrogue
diff --git a/src/client/command_db.c b/src/client/command_db.c
index 699eb46..f5670a8 100644
--- a/src/client/command_db.c
+++ b/src/client/command_db.c
@@ -1,6 +1,7 @@
/* src/client/command_db.c */
#include "command_db.h"
+#include /* NULL */
#include /* uint8_t, uint32_t */
#include /* FILE */
#include /* free() */
@@ -32,9 +33,9 @@ static void copy_tokenized_string(char * line, char ** ch_ptr, char * delim)
extern struct Command * get_command(char * dsc_short)
{
- struct Command * cmd_ptr = world.cmd_db.cmds;
+ struct Command * cmd_ptr = world.commandDB.cmds;
uint8_t i = 0;
- while (i < world.cmd_db.n)
+ while (i < world.commandDB.n)
{
if (0 == strcmp(dsc_short, cmd_ptr->dsc_short))
{
@@ -46,7 +47,7 @@ extern struct Command * get_command(char * dsc_short)
char * err_start = "get_command_data() failed on request for: ";
char err[strlen(err_start) + strlen(dsc_short) + 1];
sprintf(err, "%s%s", err_start, dsc_short);
- exit_err(i == world.cmd_db.n, err);
+ exit_err(i == world.commandDB.n, err);
return cmd_ptr;
}
@@ -60,7 +61,7 @@ extern void init_command_db()
uint32_t lines;
uint32_t linemax = textfile_sizes(file, &lines);
char line[linemax + 1];
- world.cmd_db.cmds = try_malloc(lines * sizeof(struct Command), f_name);
+ world.commandDB.cmds = try_malloc(lines * sizeof(struct Command), f_name);
uint8_t i = 0;
char * delim = " ";
while (try_fgets(line, linemax + 1, file, f_name))
@@ -69,20 +70,20 @@ extern void init_command_db()
{
break;
}
- copy_tokenized_string(line, &world.cmd_db.cmds[i].dsc_short, delim);
- copy_tokenized_string(NULL, &world.cmd_db.cmds[i].server_msg, delim);
- if (!strcmp("0", world.cmd_db.cmds[i].server_msg))
- {
- free(world.cmd_db.cmds[i].server_msg);
- world.cmd_db.cmds[i].server_msg = NULL;
- }
+ copy_tokenized_string(line, &world.commandDB.cmds[i].dsc_short, delim);
+ copy_tokenized_string(NULL, &world.commandDB.cmds[i].server_msg, delim);
+ if (!strcmp("0", world.commandDB.cmds[i].server_msg))
+ { /*.server_msg==0 detects*/
+ free(world.commandDB.cmds[i].server_msg); /* non-server commands */
+ world.commandDB.cmds[i].server_msg = NULL;/* in try_key() / */
+ } /* try_server_command().*/
char * arg_string = strtok(NULL, delim);
- world.cmd_db.cmds[i].arg = arg_string[0];
- copy_tokenized_string(NULL, &world.cmd_db.cmds[i].dsc_long, "\n");
+ world.commandDB.cmds[i].arg = arg_string[0];
+ copy_tokenized_string(NULL, &world.commandDB.cmds[i].dsc_long, "\n");
i++;
}
try_fclose(file, f_name);
- world.cmd_db.n = lines;
+ world.commandDB.n = lines;
set_cleanup_flag(CLEANUP_COMMANDS);
}
@@ -91,12 +92,12 @@ extern void init_command_db()
extern void free_command_db()
{
uint8_t i = 0;
- while (i < world.cmd_db.n)
+ while (i < world.commandDB.n)
{
- free(world.cmd_db.cmds[i].dsc_short);
- free(world.cmd_db.cmds[i].dsc_long);
- free(world.cmd_db.cmds[i].server_msg);
+ free(world.commandDB.cmds[i].dsc_short);
+ free(world.commandDB.cmds[i].dsc_long);
+ free(world.commandDB.cmds[i].server_msg);
i++;
}
- free(world.cmd_db.cmds);
+ free(world.commandDB.cmds);
}