Skip to content
Snippets Groups Projects
Commit 77de0366 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Add helper functions for returning lib, grp, dir, and sub short names

parent 2a99343f
No related branches found
No related tags found
1 merge request!455Update branch with changes from master
......@@ -773,6 +773,10 @@ public:
int dir_op(int dirnum);
bool is_valid_subnum(int subnum) { return ::is_valid_subnum(&cfg, subnum); }
bool is_valid_dirnum(int dirnum) { return ::is_valid_dirnum(&cfg, dirnum); }
char* dir_name(int dirnum) { return ::dir_name(&cfg, dirnum); }
char* lib_name(int dirnum) { return ::lib_name(&cfg, dirnum); }
char* sub_name(int subnum) { return ::sub_name(&cfg, subnum); }
char* grp_name(int subnum) { return ::grp_name(&cfg, subnum); }
void getmsgptrs(void);
void putmsgptrs(void);
......
......@@ -65,6 +65,10 @@ int getgurunum(scfg_t*, const char* code);
int getchatactset(scfg_t*, const char* name);
int getxeditnum(scfg_t*, const char* code);
int getshellnum(scfg_t*, const char* code);
char* lib_name(scfg_t*, int dirnum);
char* dir_name(scfg_t*, int dirnum);
char* grp_name(scfg_t*, int subnum);
char* sub_name(scfg_t*, int subnum);
DLLEXPORT bool is_valid_dirnum(scfg_t*, int);
DLLEXPORT bool is_valid_libnum(scfg_t*, int);
......
......@@ -739,6 +739,40 @@ int getgrpnum(scfg_t* cfg, const char* code)
return i;
}
char* lib_name(scfg_t* cfg, int dirnum)
{
if(!is_valid_dirnum(cfg, dirnum))
return "<invalid dir>";
int libnum = cfg->dir[dirnum]->lib;
if(!is_valid_libnum(cfg, libnum))
return "<invalid lib>";
return cfg->lib[libnum]->sname;
}
char* dir_name(scfg_t* cfg, int dirnum)
{
if(!is_valid_dirnum(cfg, dirnum))
return "<invalid dir>";
return cfg->dir[dirnum]->sname;
}
char* grp_name(scfg_t* cfg, int subnum)
{
if(!is_valid_subnum(cfg, subnum))
return "<invalid sub>";
int grpnum = cfg->sub[subnum]->grp;
if(!is_valid_grpnum(cfg, grpnum))
return "<invalid grp>";
return cfg->grp[grpnum]->sname;
}
char* sub_name(scfg_t* cfg, int subnum)
{
if(!is_valid_subnum(cfg, subnum))
return "<invalid sub>";
return cfg->sub[subnum]->sname;
}
int getgrpnum_from_name(scfg_t* cfg, const char* name)
{
int i;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment