philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify show_version()

Browse Source 
Re-order the code to squash two copies of the formatting code into one.
This commit is contained in:
Kevin Easton
2016-10-18 23:54:46 +11:00
parent 0a90a9d9db
commit b462cf0001
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/commands2.c
View File

@@ -914,18 +914,22 @@ else
BUILT_IN_COMMAND(show_version) BUILT_IN_COMMAND(show_version)
{ {
char *nick; char *nick;
char *version_buf = NULL; char *version_buf;
extern char tcl_versionstr[]; const char *sysname = "unknown";
const char *release = "unknown";
extern char tcl_versionstr[];
#ifdef HAVE_UNAME #ifdef HAVE_UNAME
struct utsname buf; struct utsname buf;
uname(&buf); uname(&buf);
malloc_strcpy(&version_buf, stripansicodes(convert_output_format(fget_string_var(FORMAT_VERSION_FSET), "%s %s %s %s %s", irc_version, internal_version, buf.sysname, buf.release?buf.release:empty_string, tcl_versionstr))); sysname = buf.sysname;
#else release = buf.release;
malloc_strcpy(&version_buf, stripansicodes(convert_output_format(fget_string_var(FORMAT_VERSION_FSET), "%s %s %s %s %s", irc_version, internal_version, "unknown", tcl_versionstr, empty_string)));
#endif #endif
version_buf = m_strdup(stripansicodes(convert_output_format(fget_string_var(FORMAT_VERSION_FSET), "%s %s %s %s %s", irc_version, internal_version, sysname, release, tcl_versionstr)));
if (args && *args) if (args && *args)
nick = next_arg(args, &args); nick = next_arg(args, &args);
else else