projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed compiler warning by adding missing variable initialization
[rocksndiamonds.git]
/
src
/
config.c
diff --git
a/src/config.c
b/src/config.c
index da6d1a9613da12434bbf0f727ba29f52c22d3a7e..608b066ed64f89aa3ed42b81a0e9a24a8965de0f 100644
(file)
--- a/
src/config.c
+++ b/
src/config.c
@@
-15,18
+15,23
@@
#include "conftime.h"
#include "conftime.h"
-char *get
Compil
eDateString()
+char *get
Sourc
eDateString()
{
{
- return COMPILE_DATE_STRING;
+ return SOURCE_DATE_STRING;
+}
+
+char *getProgramTitleString()
+{
+ return program.program_title;
}
char *getProgramVersionString()
{
static char program_version_string[32];
}
char *getProgramVersionString()
{
static char program_version_string[32];
- sprintf(program_version_string, "%d.%d.%d.%d",
+ sprintf(program_version_string, "%d.%d.%d.%d
%s
",
PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH,
PROGRAM_VERSION_MAJOR, PROGRAM_VERSION_MINOR, PROGRAM_VERSION_PATCH,
- PROGRAM_VERSION_BUILD);
+ PROGRAM_VERSION_BUILD
, PROGRAM_VERSION_EXTRA
);
return program_version_string;
}
return program_version_string;
}
@@
-37,11
+42,11
@@
char *getProgramInitString()
if (program_init_string == NULL)
{
if (program_init_string == NULL)
{
- program_init_string = checked_malloc(strlen(
PROGRAM_TITLE_STRING
) + 1 +
+ program_init_string = checked_malloc(strlen(
getProgramTitleString()
) + 1 +
strlen(getProgramVersionString()) + 1);
sprintf(program_init_string, "%s %s",
strlen(getProgramVersionString()) + 1);
sprintf(program_init_string, "%s %s",
-
PROGRAM_TITLE_STRING
, getProgramVersionString());
+
getProgramTitleString()
, getProgramVersionString());
}
return program_init_string;
}
return program_init_string;
@@
-57,26
+62,26
@@
char *getWindowTitleString()
#ifdef DEBUG
window_title_string = checked_malloc(strlen(getProgramInitString()) + 20 +
#ifdef DEBUG
window_title_string = checked_malloc(strlen(getProgramInitString()) + 20 +
- strlen(get
Compil
eDateString()) + 2 + 1);
+ strlen(get
Sourc
eDateString()) + 2 + 1);
sprintf(window_title_string, "%s (%d %%) [%s]",
sprintf(window_title_string, "%s (%d %%) [%s]",
- getProgramInitString(),
setup
.window_scaling_percent,
- get
Compil
eDateString());
+ getProgramInitString(),
video
.window_scaling_percent,
+ get
Sourc
eDateString());
#else
window_title_string = checked_malloc(strlen(getProgramInitString()) + 20);
sprintf(window_title_string, "%s (%d %%)",
#else
window_title_string = checked_malloc(strlen(getProgramInitString()) + 20);
sprintf(window_title_string, "%s (%d %%)",
- getProgramInitString(),
setup
.window_scaling_percent);
+ getProgramInitString(),
video
.window_scaling_percent);
#endif
#else
#ifdef DEBUG
window_title_string = checked_malloc(strlen(getProgramInitString()) + 1 +
#endif
#else
#ifdef DEBUG
window_title_string = checked_malloc(strlen(getProgramInitString()) + 1 +
- strlen(get
Compil
eDateString()) + 2 + 1);
+ strlen(get
Sourc
eDateString()) + 2 + 1);
sprintf(window_title_string, "%s [%s]",
sprintf(window_title_string, "%s [%s]",
- getProgramInitString(), get
Compil
eDateString());
+ getProgramInitString(), get
Sourc
eDateString());
#else
window_title_string = checked_malloc(strlen(getProgramInitString()) + 1);
#else
window_title_string = checked_malloc(strlen(getProgramInitString()) + 1);