aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Remove code duplication.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4493 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2007-05-14 21:22:41 +00:00 committed by exg
parent 0a9a05c5c0
commit c235c679cc
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/special-vars.c
View File

@ -87,27 +87,12 @@ static char *get_argument(char **cmd, char **arglist)
return ret; return ret;
} }
static char *get_internal_setting(const char *key, int type, int *free_ret)
{
switch (type) {
case SETTING_TYPE_BOOLEAN:
return settings_get_bool(key) ? "yes" : "no";
case SETTING_TYPE_INT:
*free_ret = TRUE;
return g_strdup_printf("%d", settings_get_int(key));
case SETTING_TYPE_STRING:
return (char *) settings_get_str(key);
}
return NULL;
}
static char *get_long_variable_value(const char *key, SERVER_REC *server, static char *get_long_variable_value(const char *key, SERVER_REC *server,
void *item, int *free_ret) void *item, int *free_ret)
{ {
EXPANDO_FUNC func; EXPANDO_FUNC func;
const char *ret; const char *ret;
int type; SETTINGS_REC *rec;
*free_ret = FALSE; *free_ret = FALSE;
@ -119,9 +104,11 @@ static char *get_long_variable_value(const char *key, SERVER_REC *server,
} }
/* internal setting? */ /* internal setting? */
type = settings_get_type(key); rec = settings_get_record(key);
if (type != -1) if (rec != NULL) {
return get_internal_setting(key, type, free_ret); *free_ret = TRUE;
return settings_get_print(rec);
}
/* environment variable? */ /* environment variable? */
ret = g_getenv(key); ret = g_getenv(key);