diff options
author | Neil Moore <neil@s-z.org> | 2013-05-26 21:04:07 -0400 |
---|---|---|
committer | Neil Moore <neil@s-z.org> | 2013-05-26 21:04:07 -0400 |
commit | a113299bdbe919fad5791a8179fedb2ebfa76fe4 (patch) | |
tree | 1396899ee7980eb48876b4299acd5374c018298c /crawl-ref/source/chardump.cc | |
parent | 2411ffc4a2a8c7f1385811d5ffd4e20669ca07b1 (diff) | |
download | crawl-ref-a113299bdbe919fad5791a8179fedb2ebfa76fe4.tar.gz crawl-ref-a113299bdbe919fad5791a8179fedb2ebfa76fe4.zip |
Make some functions static and fix a DGL compilation warning.
Diffstat (limited to 'crawl-ref/source/chardump.cc')
-rw-r--r-- | crawl-ref/source/chardump.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc index c5331ba06d..a7e1095323 100644 --- a/crawl-ref/source/chardump.cc +++ b/crawl-ref/source/chardump.cc @@ -1548,7 +1548,7 @@ const int TIMESTAMP_SIZE = sizeof(uint32_t); // Returns the name of the timestamp file based on the morgue_dir, // character name and the game start time. -string dgl_timestamp_filename() +static string _dgl_timestamp_filename() { const string filename = "timestamp-" + you.your_name + "-" + make_file_time(you.birth_time); @@ -1557,7 +1557,7 @@ string dgl_timestamp_filename() // Returns true if the given file exists and is not a timestamp file // of a known version. -bool dgl_unknown_timestamp_file(const string &filename) +static bool _dgl_unknown_timestamp_file(const string &filename) { if (FILE *inh = fopen_u(filename.c_str(), "rb")) { @@ -1571,7 +1571,7 @@ bool dgl_unknown_timestamp_file(const string &filename) // Returns a filehandle to use to write turn timestamps, NULL if // timestamps should not be written. -FILE *dgl_timestamp_filehandle() +static FILE *_dgl_timestamp_filehandle() { static FILE *timestamp_file; static bool opened_file = false; @@ -1579,10 +1579,10 @@ FILE *dgl_timestamp_filehandle() { opened_file = true; - const string filename = dgl_timestamp_filename(); + const string filename = _dgl_timestamp_filename(); // First check if there's already a timestamp file. If it exists // but has a different version, we cannot safely modify it, so bail. - if (!dgl_unknown_timestamp_file(filename)) + if (!_dgl_unknown_timestamp_file(filename)) timestamp_file = fopen_u(filename.c_str(), "ab"); } return timestamp_file; @@ -1590,12 +1590,12 @@ FILE *dgl_timestamp_filehandle() // Records a timestamp in the .ts file at the given offset. If no timestamp // file exists, a new file will be created. -void dgl_record_timestamp(unsigned long file_offset, time_t time) +static void _dgl_record_timestamp(unsigned long file_offset, time_t time) { static bool timestamp_first_write = true; - if (FILE *ftimestamp = dgl_timestamp_filehandle()) + if (FILE *ftimestamp = _dgl_timestamp_filehandle()) { - writer w(dgl_timestamp_filename(), ftimestamp, true); + writer w(_dgl_timestamp_filename(), ftimestamp, true); if (timestamp_first_write) { unsigned long ts_size = file_size(ftimestamp); @@ -1635,7 +1635,7 @@ void dgl_record_timestamp(unsigned long file_offset, time_t time) const int TIMESTAMP_TURN_INTERVAL = 100; // Stop recording timestamps after this turncount. const int TIMESTAMP_TURN_MAX = 500000; -void dgl_record_timestamp(int turn) +static void _dgl_record_timestamp(int turn) { if (turn && turn < TIMESTAMP_TURN_MAX && !(turn % TIMESTAMP_TURN_INTERVAL)) { @@ -1643,7 +1643,7 @@ void dgl_record_timestamp(int turn) const unsigned long offset = (VERSION_SIZE + (turn / TIMESTAMP_TURN_INTERVAL - 1) * TIMESTAMP_SIZE); - dgl_record_timestamp(offset, now); + _dgl_record_timestamp(offset, now); } } @@ -1654,6 +1654,6 @@ void record_turn_timestamp() { #ifdef DGL_TURN_TIMESTAMPS if (crawl_state.need_save) - dgl_record_timestamp(you.num_turns); + _dgl_record_timestamp(you.num_turns); #endif } |