<URL: http://bugs.freeciv.org/Ticket/Display.html?id=10400 >
Went through *all* the 2.2 sources. Found quite a few that are debugging
messages, not "normal" user messages. New symbols LOG_TEST (same level as
LOG_NORMAL) and LOG_PACKET (same level as LOG_VERBOSE).
Actually results in very few new messages to translate:
Index: utility/inputfile.c
===================================================================
--- utility/inputfile.c (revision 14283)
+++ utility/inputfile.c (working copy)
@@ -592,7 +592,7 @@
func = tok_tab[type].func;
if (!func) {
- freelog(LOG_NORMAL, "token type %d (%s) not supported yet", type, name);
+ freelog(LOG_ERROR, "token type %d (%s) not supported yet", type, name);
c = NULL;
} else {
if (!have_line(inf))
Index: utility/ioz.c
===================================================================
--- utility/ioz.c (revision 14283)
+++ utility/ioz.c (working copy)
@@ -107,13 +107,13 @@
#ifndef HAVE_LIBZ
if (method == FZ_ZLIB) {
- freelog(LOG_NORMAL, "Not compiled with zlib support, reverting to
plain.");
+ freelog(LOG_ERROR, "Not compiled with zlib support, reverting to
plain.");
method = FZ_PLAIN;
}
#endif
#ifndef HAVE_LIBBZ2
if (method == FZ_BZIP2) {
- freelog(LOG_NORMAL, "Not compiled with bzib2 support, reverting to
plain.");
+ freelog(LOG_ERROR, "Not compiled with bzib2 support, reverting to
plain.");
method = FZ_PLAIN;
}
#endif
Index: utility/ftwl/widget_window.c
===================================================================
--- utility/ftwl/widget_window.c (revision 14283)
+++ utility/ftwl/widget_window.c (working copy)
@@ -389,14 +389,12 @@
be_copy_osda_to_screen(whole_osda, NULL);
if (dump_screen) {
- static int counter = -1;
+ static int counter = 0;
char b[100];
- counter++;
+ my_snprintf(b, sizeof(b), "fc_%05d.ppm", counter++);
+ freelog(LOG_NORMAL, _("Making screenshot %s"), b);
- freelog(LOG_NORMAL, "flush to screen %d",counter);
-
- sprintf(b, "screen-%04d.ppm", counter);
be_write_osda_to_file(whole_osda, b);
}
}
Index: utility/ftwl/text_renderer.c
===================================================================
--- utility/ftwl/text_renderer.c (revision 14283)
+++ utility/ftwl/text_renderer.c (working copy)
@@ -190,7 +190,7 @@
ft_kerning_default, &delta);
pen.x += delta.x >> 6;
if (0 && delta.x)
- freelog(LOG_NORMAL, "kerning between %c and %c is %ld in '%s'\n",
+ freelog(LOG_VERBOSE, "kerning between %c and %c is %ld in '%s'\n",
text[i - 1], c, delta.x >> 6, text);
}
Index: utility/ftwl/be_sdl_pixels_32.c
===================================================================
--- utility/ftwl/be_sdl_pixels_32.c (revision 14283)
+++ utility/ftwl/be_sdl_pixels_32.c (working copy)
@@ -67,12 +67,12 @@
}
atexit(SDL_Quit);
- freelog(LOG_NORMAL, "Using Video Output: %s",
+ freelog(LOG_NORMAL, _("Using Video Output: %s"),
SDL_VideoDriverName(device, sizeof(device)));
{
const SDL_VideoInfo *info = SDL_GetVideoInfo();
- freelog(LOG_NORMAL, "Video memory of driver: %dkb", info->video_mem);
- freelog(LOG_NORMAL, "Preferred depth: %d bits per pixel",
+ freelog(LOG_VERBOSE, "Video memory of driver: %dkb", info->video_mem);
+ freelog(LOG_VERBOSE, "Preferred depth: %d bits per pixel",
info->vfmt->BitsPerPixel);
}
@@ -104,12 +104,12 @@
exit(1);
}
- freelog(LOG_NORMAL, "Got a screen with size (%dx%d) and %d bits per pixel",
+ freelog(LOG_VERBOSE, "Got a screen with size (%dx%d) and %d bits per pixel",
screen->w, screen->h, screen->format->BitsPerPixel);
- freelog(LOG_NORMAL, " format: red=0x%x green=0x%x blue=0x%x mask=0x%x",
+ freelog(LOG_VERBOSE, " format: red=0x%x green=0x%x blue=0x%x mask=0x%x",
screen->format->Rmask, screen->format->Gmask,
screen->format->Bmask, screen->format->Amask);
- freelog(LOG_NORMAL, " format: bits-per-pixel=%d bytes-per-pixel=%d",
+ freelog(LOG_VERBOSE, " format: bits-per-pixel=%d bytes-per-pixel=%d",
screen->format->BitsPerPixel, screen->format->BytesPerPixel);
SDL_EnableUNICODE(1);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
Index: utility/ftwl/be_sdl.c
===================================================================
--- utility/ftwl/be_sdl.c (revision 14283)
+++ utility/ftwl/be_sdl.c (working copy)
@@ -119,7 +119,7 @@
Uint16 unicode = sdl_event->key.keysym.unicode;
if (unicode == 0) {
- freelog(LOG_NORMAL, "unicode == 0");
+ freelog(LOG_TEST, "unicode == 0");
return FALSE;
}
if ((unicode & 0xFF80) != 0) {
@@ -140,7 +140,7 @@
exit(EXIT_SUCCESS);
default:
- // freelog(LOG_NORMAL, "ignored event %d\n", sdl_event->type);
+ // freelog(LOG_TEST, "ignored event %d\n", sdl_event->type);
return FALSE;
}
return TRUE;
Index: utility/ftwl/be_sdl_pixels_cairo_32.c
===================================================================
--- utility/ftwl/be_sdl_pixels_cairo_32.c (revision 14283)
+++ utility/ftwl/be_sdl_pixels_cairo_32.c (working copy)
@@ -53,12 +53,12 @@
}
atexit(SDL_Quit);
- freelog(LOG_NORMAL, "Using Video Output: %s",
+ freelog(LOG_NORMAL, _("Using Video Output: %s"),
SDL_VideoDriverName(device, sizeof(device)));
{
const SDL_VideoInfo *info = SDL_GetVideoInfo();
- freelog(LOG_NORMAL, "Video memory of driver: %dkb", info->video_mem);
- freelog(LOG_NORMAL, "Preferred depth: %d bits per pixel",
+ freelog(LOG_VERBOSE, "Video memory of driver: %dkb", info->video_mem);
+ freelog(LOG_VERBOSE, "Preferred depth: %d bits per pixel",
info->vfmt->BitsPerPixel);
}
@@ -94,12 +94,12 @@
CAIRO_FORMAT_RGB24,
screen->w, screen->h,
screen->pitch);
- freelog(LOG_NORMAL, "Got a screen with size (%dx%d) and %d bits per pixel",
+ freelog(LOG_VERBOSE, "Got a screen with size (%dx%d) and %d bits per pixel",
screen->w, screen->h, screen->format->BitsPerPixel);
- freelog(LOG_NORMAL, " format: red=0x%x green=0x%x blue=0x%x mask=0x%x",
+ freelog(LOG_VERBOSE, " format: red=0x%x green=0x%x blue=0x%x mask=0x%x",
screen->format->Rmask, screen->format->Gmask,
screen->format->Bmask, screen->format->Amask);
- freelog(LOG_NORMAL, " format: bits-per-pixel=%d bytes-per-pixel=%d",
+ freelog(LOG_VERBOSE, " format: bits-per-pixel=%d bytes-per-pixel=%d",
screen->format->BitsPerPixel, screen->format->BytesPerPixel);
SDL_EnableUNICODE(1);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
Index: utility/rand.c
===================================================================
--- utility/rand.c (revision 14283)
+++ utility/rand.c (working copy)
@@ -212,7 +212,7 @@
/*************************************************************************
Test one aspect of randomness, using n numbers.
- Reports results to LOG_NORMAL; with good randomness, behaviourchange
+ Reports results to LOG_TEST; with good randomness, behaviourchange
and behavioursame should be about the same size.
Tests current random state; saves and restores state, so can call
without interrupting current sequence.
@@ -242,7 +242,7 @@
}
old_value = new_value;
}
- freelog(LOG_NORMAL, "test_random1(%d) same: %d, change: %d",
+ freelog(LOG_TEST, "test_random1(%d) same: %d, change: %d",
n, behavioursame, behaviourchange);
/* restore state: */
Index: utility/log.h
===================================================================
--- utility/log.h (revision 14283)
+++ utility/log.h (working copy)
@@ -24,6 +24,10 @@
#define LOG_DEBUG 4 /* suppressed unless DEBUG defined;
may be enabled on file/line basis */
+/* Used by game debug command */
+#define LOG_TEST LOG_NORMAL
+#define LOG_PACKET LOG_VERBOSE
+
/* Some variables local to each file which includes log.h,
to record whether LOG_DEBUG messages apply for that file
and if so for which lines (min,max) :
Index: utility/timing.c
===================================================================
--- utility/timing.c (revision 14283)
+++ utility/timing.c (working copy)
@@ -111,7 +111,7 @@
static bool first = TRUE;
if (first) {
- freelog(LOG_NORMAL, "clock() returned -1, ignoring timer");
+ freelog(LOG_TEST, "clock() returned -1, ignoring timer");
first = FALSE;
}
t->use = TIMER_IGNORE;
@@ -127,7 +127,7 @@
static bool first = TRUE;
if (first) {
- freelog(LOG_NORMAL, "gettimeofday() returned -1, ignoring timer");
+ freelog(LOG_TEST, "gettimeofday() returned -1, ignoring timer");
first = FALSE;
}
t->use = TIMER_IGNORE;
@@ -142,7 +142,7 @@
static bool first = TRUE;
if (first) {
- freelog(LOG_NORMAL, "time() returned -1, ignoring timer");
+ freelog(LOG_TEST, "time() returned -1, ignoring timer");
first = FALSE;
}
t->use = TIMER_IGNORE;
@@ -385,7 +385,7 @@
{
struct timer *t = new_timer_start();
...do stuff...
- freelog(LOG_NORMAL, "That took %g seconds", read_timer_seconds_free(t));
+ freelog(LOG_TEST, "That took %g seconds", read_timer_seconds_free(t));
}
(BUT: make sure the _free call really happens!
eg, freelog(LOG_DEBUG,...) might not actually evaluate its args.)
Index: server/srv_main.c
===================================================================
--- server/srv_main.c (revision 14283)
+++ server/srv_main.c (working copy)
@@ -941,8 +941,11 @@
case FZ_PLAIN:
break;
default:
- freelog(LOG_NORMAL, "Unsupported compression type %d",
+ freelog(LOG_ERROR, _("Unsupported compression type %d"),
game.info.save_compress_type);
+ notify_conn(NULL, NULL, E_SETTING,
+ _("Unsupported compression type %d"),
+ game.info.save_compress_type);
break;
}
}
Index: server/auth.c
===================================================================
--- server/auth.c (revision 14283)
+++ server/auth.c (working copy)
@@ -430,7 +430,7 @@
reject_new_connection(_("This server allows only preregistered "
"users. Sorry."), pconn);
freelog(LOG_NORMAL,
- _("%s was rejected: Only preregister users allowed."),
+ _("%s was rejected: Only preregistered users allowed."),
pconn->username);
return FALSE;
Index: server/diplhand.c
===================================================================
--- server/diplhand.c (revision 14283)
+++ server/diplhand.c (working copy)
@@ -427,7 +427,7 @@
struct city *pcity = game_find_city_by_number(pclause->value);
if (!pcity) {
- freelog(LOG_NORMAL,
+ freelog(LOG_ERROR,
"Treaty city id %d not found - skipping clause.",
pclause->value);
break;
Index: server/unittools.c
===================================================================
--- server/unittools.c (revision 14283)
+++ server/unittools.c (working copy)
@@ -2402,10 +2402,12 @@
|| get_transporter_capacity(punit) > 0)
&& penemywin > threshold) {
#ifdef REALLY_DEBUG_THIS
- freelog(LOG_NORMAL, "AA %s -> %s (%d,%d) %.2f > %.2f && > %.2f",
+ freelog(LOG_TEST, "AA %s -> %s (%d,%d) %.2f > %.2f && > %.2f",
unit_rule_name(penemy),
unit_rule_name(punit),
- punit->tile->x, punit->tile->y, penemywin, 1.0 - punitwin,
+ TILE_XY(punit->tile),
+ penemywin,
+ 1.0 - punitwin,
threshold);
#endif
@@ -2414,10 +2416,12 @@
}
#ifdef REALLY_DEBUG_THIS
else {
- freelog(LOG_NORMAL, "!AA %s -> %s (%d,%d) %.2f > %.2f && > %.2f",
+ freelog(LOG_TEST, "!AA %s -> %s (%d,%d) %.2f > %.2f && > %.2f",
unit_rule_name(penemy),
unit_rule_name(punit),
- punit->tile->x, punit->tile->y, penemywin, 1.0 - punitwin,
+ TILE_XY(punit->tile),
+ penemywin,
+ 1.0 - punitwin,
threshold);
continue;
}
Index: server/sernet.c
===================================================================
--- server/sernet.c (revision 14283)
+++ server/sernet.c (working copy)
@@ -489,8 +489,8 @@
if (last_noplayers != 0) {
if (time(NULL) > last_noplayers + srvarg.quitidle) {
save_game_auto("Lost all connections");
- set_meta_message_string("restarting for lack of players");
- freelog(LOG_NORMAL, get_meta_message_string());
+ set_meta_message_string(N_("restarting for lack of players"));
+ freelog(LOG_NORMAL, Q_(get_meta_message_string()));
(void) send_server_info_to_metaserver(META_INFO);
set_server_state(S_S_OVER);
@@ -509,14 +509,8 @@
connections = FALSE;
}
} else {
- char buf[256];
- last_noplayers = time(NULL);
-
- my_snprintf(buf, sizeof(buf),
- "restarting in %d seconds for lack of players",
- srvarg.quitidle);
- set_meta_message_string((const char *)buf);
- freelog(LOG_NORMAL, get_meta_message_string());
+ set_meta_message_string(N_("restarting for lack of players"));
+ freelog(LOG_NORMAL, Q_(get_meta_message_string()));
(void) send_server_info_to_metaserver(META_INFO);
}
} else {
@@ -1023,7 +1017,7 @@
struct timer *timer;
if (timer_list_size(pconn->server.ping_timers) == 0) {
- freelog(LOG_NORMAL, "got unexpected pong from %s",
+ freelog(LOG_ERROR, "got unexpected pong from %s",
conn_description(pconn));
return;
}
@@ -1169,16 +1163,20 @@
switch (server_state()) {
case S_S_INITIAL:
- my_snprintf(status, sizeof(status), "Pregame");
+ /* TRANS: Game state for local server */
+ my_snprintf(status, sizeof(status), _("Pregame"));
break;
case S_S_RUNNING:
- my_snprintf(status, sizeof(status), "Running");
+ /* TRANS: Game state for local server */
+ my_snprintf(status, sizeof(status), _("Running"));
break;
case S_S_OVER:
- my_snprintf(status, sizeof(status), "Game over");
+ /* TRANS: Game state for local server */
+ my_snprintf(status, sizeof(status), _("Game over"));
break;
case S_S_GENERATING_WAITING:
- my_snprintf(status, sizeof(status), "Waiting");
+ /* TRANS: Game state for local server */
+ my_snprintf(status, sizeof(status), _("Waiting"));
}
my_snprintf(players, sizeof(players), "%d",
Index: server/stdinhand.c
===================================================================
--- server/stdinhand.c (revision 14283)
+++ server/stdinhand.c (working copy)
@@ -2323,10 +2323,10 @@
units++;
} unit_list_iterate_end;
} players_iterate_end;
- freelog(LOG_NORMAL, "players=%d cities=%d citizens=%d units=%d",
+ freelog(LOG_NORMAL, _("players=%d cities=%d citizens=%d units=%d"),
players, cities, citizens, units);
notify_conn(game.est_connections, NULL, E_AI_DEBUG,
- "players=%d cities=%d citizens=%d units=%d",
+ _("players=%d cities=%d citizens=%d units=%d"),
players, cities, citizens, units);
} else if (ntokens > 0 && strcmp(arg[0], "city") == 0) {
int x, y;
@@ -2356,7 +2356,7 @@
city_name(pcity));
} else {
pcity->debug = TRUE;
- CITY_LOG(LOG_NORMAL, pcity, "debugged");
+ CITY_LOG(LOG_TEST, pcity, "debugged");
pcity->ai.next_recalc = 0; /* force recalc of city next turn */
}
} else if (ntokens > 0 && strcmp(arg[0], "units") == 0) {
@@ -2383,7 +2383,7 @@
unit_name_translation(punit));
} else {
punit->debug = TRUE;
- UNIT_LOG(LOG_NORMAL, punit, _("%s %s debugged."),
+ UNIT_LOG(LOG_TEST, punit, "%s %s debugged.",
nation_adjective_for_player(unit_owner(punit)),
unit_name_translation(punit));
}
@@ -2422,7 +2422,7 @@
unit_name_translation(punit));
} else {
punit->debug = TRUE;
- UNIT_LOG(LOG_NORMAL, punit, _("%s %s debugged."),
+ UNIT_LOG(LOG_TEST, punit, "%s %s debugged.",
nation_adjective_for_player(unit_owner(punit)),
unit_name_translation(punit));
}
Index: common/dataio.c
===================================================================
--- common/dataio.c (revision 14283)
+++ common/dataio.c (working copy)
@@ -592,7 +592,7 @@
dio_get_uint16(din, &npack);
if (npack >= max_dest_size) {
- freelog(LOG_NORMAL, "Have size for %lu, got %d",
+ freelog(LOG_ERROR, "Have size for %lu, got %d",
(unsigned long)max_dest_size, npack);
din->bad_bit_string = TRUE;
dest[0] = '\0';
Index: common/aicore/cm.c
===================================================================
--- common/aicore/cm.c (revision 14283)
+++ common/aicore/cm.c (working copy)
@@ -2039,28 +2039,28 @@
****************************************************************************/
void cm_print_city(const struct city *pcity)
{
- freelog(LOG_NORMAL, "print_city(city='%s'(id=%d))",
+ freelog(LOG_TEST, "print_city(city='%s'(id=%d))",
city_name(pcity), pcity->id);
- freelog(LOG_NORMAL,
+ freelog(LOG_TEST,
" size=%d, specialists=%s",
pcity->size, specialists_string(pcity->specialists));
- freelog(LOG_NORMAL, " workers at:");
+ freelog(LOG_TEST, " workers at:");
my_city_map_iterate(pcity, x, y) {
if (pcity->city_map[x][y] == C_TILE_WORKER) {
- freelog(LOG_NORMAL, " (%2d,%2d)", x, y);
+ freelog(LOG_TEST, " (%2d,%2d)", x, y);
}
} my_city_map_iterate_end;
- freelog(LOG_NORMAL, " food = %3d (%+3d)",
+ freelog(LOG_TEST, " food = %3d (%+3d)",
pcity->prod[O_FOOD], pcity->surplus[O_FOOD]);
- freelog(LOG_NORMAL, " shield = %3d (%+3d)",
+ freelog(LOG_TEST, " shield = %3d (%+3d)",
pcity->prod[O_SHIELD], pcity->surplus[O_SHIELD]);
- freelog(LOG_NORMAL, " trade = %3d", pcity->surplus[O_TRADE]);
+ freelog(LOG_TEST, " trade = %3d", pcity->surplus[O_TRADE]);
- freelog(LOG_NORMAL, " gold = %3d (%+3d)", pcity->prod[O_GOLD],
+ freelog(LOG_TEST, " gold = %3d (%+3d)", pcity->prod[O_GOLD],
pcity->surplus[O_GOLD]);
- freelog(LOG_NORMAL, " luxury = %3d", pcity->prod[O_LUXURY]);
- freelog(LOG_NORMAL, " science = %3d", pcity->prod[O_SCIENCE]);
+ freelog(LOG_TEST, " luxury = %3d", pcity->prod[O_LUXURY]);
+ freelog(LOG_TEST, " science = %3d", pcity->prod[O_SCIENCE]);
}
@@ -2072,15 +2072,15 @@
{
int y, worker = cm_count_worker(pcity, result);
- freelog(LOG_NORMAL, "print_result(result=%p)", (void *)result);
- freelog(LOG_NORMAL,
+ freelog(LOG_TEST, "print_result(result=%p)", (void *)result);
+ freelog(LOG_TEST,
"print_result: found_a_valid=%d disorder=%d happy=%d",
result->found_a_valid, result->disorder, result->happy);
- freelog(LOG_NORMAL, "print_result: workers at:");
+ freelog(LOG_TEST, "print_result: workers at:");
my_city_map_iterate(pcity, x, y) {
if (result->worker_positions_used[x][y]) {
- freelog(LOG_NORMAL, "print_result: (%2d,%2d)", x, y);
+ freelog(LOG_TEST, "print_result: (%2d,%2d)", x, y);
}
} my_city_map_iterate_end;
@@ -2101,14 +2101,14 @@
line[x] = '.';
}
}
- freelog(LOG_NORMAL, "print_result: %s", line);
+ freelog(LOG_TEST, "print_result: %s", line);
}
- freelog(LOG_NORMAL,
+ freelog(LOG_TEST,
"print_result: people: (workers/specialists) %d/%s",
worker, specialists_string(result->specialists));
output_type_iterate(i) {
- freelog(LOG_NORMAL, "print_result: %10s surplus=%d",
+ freelog(LOG_TEST, "print_result: %10s surplus=%d",
get_output_name(i), result->surplus[i]);
} output_type_iterate_end;
}
Index: common/generate_packets.py
===================================================================
--- common/generate_packets.py (revision 14283)
+++ common/generate_packets.py (working copy)
@@ -22,7 +22,7 @@
# generate_freelogs will generate freelog calls to debug the delta code.
generate_freelogs=0
-freelog_log_level="LOG_NORMAL"
+freelog_log_level="LOG_PACKET"
generate_variant_freelogs=0
### The following parameters CHANGE the protocol. You have been warned.
@@ -590,11 +590,11 @@
return '''
if (stats_%(name)s_sent > 0 &&
stats_%(name)s_discarded != stats_%(name)s_sent) {
- freelog(LOG_NORMAL, \"%(name)s %%d out of %%d got discarded\",
+ freelog(LOG_TEST, \"%(name)s %%d out of %%d got discarded\",
stats_%(name)s_discarded, stats_%(name)s_sent);
for (i = 0; i < %(bits)d; i++) {
if(stats_%(name)s_counters[i] > 0) {
- freelog(LOG_NORMAL, \" %%4d / %%4d: %%2d = %%s\",
+ freelog(LOG_TEST, \" %%4d / %%4d: %%2d = %%s\",
stats_%(name)s_counters[i],
(stats_%(name)s_sent - stats_%(name)s_discarded),
i, stats_%(name)s_names[i]);
@@ -1085,7 +1085,7 @@
no=v.no
result=result+' } else if(%(cond)s) {\n variant =
%(no)s;\n'%self.get_dict(vars())
if generate_variant_freelogs and len(self.variants)>1:
- log=' freelog(LOG_NORMAL, "%(name)s: using variant=%%d cap=%%s",
variant, pc->capability);\n'%self.get_dict(vars())
+ log=' freelog(LOG_TEST, "%(name)s: using variant=%%d cap=%%s",
variant, pc->capability);\n'%self.get_dict(vars())
else:
log=""
result=result+''' } else {
Index: common/connection.c
===================================================================
--- common/connection.c (revision 14283)
+++ common/connection.c (working copy)
@@ -555,7 +555,7 @@
int result = old_request_id + 1;
if ((result & 0xffff) == 0) {
- freelog(LOG_NORMAL,
+ freelog(LOG_PACKET,
"INFORMATION: request_id has wrapped around; "
"setting from %d to 2", result);
result = 2;
Index: common/packets.c
===================================================================
--- common/packets.c (revision 14283)
+++ common/packets.c (working copy)
@@ -273,11 +273,11 @@
packets_stats[i].size / packets_stats[i].counter,
get_packet_name(i),i);
}
- freelog(LOG_NORMAL,
+ freelog(LOG_TEST,
"turn=%d; transmitted %d bytes in %d packets;average size "
"per packet %d bytes", game.turn, sum, packet_counter,
sum / packet_counter);
- freelog(LOG_NORMAL, "turn=%d; transmitted %d bytes", game.turn,
+ freelog(LOG_TEST, "turn=%d; transmitted %d bytes", game.turn,
pc->statistics.bytes_send);
}
if (clear) {
@@ -473,19 +473,19 @@
if (packet_counter % 100 == 0) {
int i, sum = 0;
- freelog(LOG_NORMAL, "Received packets:");
+ freelog(LOG_TEST, "Received packets:");
for (i = 0; i < PACKET_LAST; i++) {
if (packets_stats[i].counter == 0)
continue;
sum += packets_stats[i].size;
- freelog(LOG_NORMAL,
+ freelog(LOG_TEST,
" [%-25.25s %3d]: %6d packets; %8d bytes total; "
"%5d bytes/packet average",
get_packet_name(i), i, packets_stats[i].counter,
packets_stats[i].size,
packets_stats[i].size / packets_stats[i].counter);
}
- freelog(LOG_NORMAL,
+ freelog(LOG_TEST,
"received %d bytes in %d packets;average size "
"per packet %d bytes",
sum, packet_counter, sum / packet_counter);
Index: ai/aidata.c
===================================================================
--- ai/aidata.c (revision 14283)
+++ ai/aidata.c (working copy)
@@ -361,7 +361,7 @@
for(i = 1; i <= ai->num_oceans; i++) {
for(j = 1; j <= ai->num_oceans; j++) {
if (ai->channels[i * ai->num_oceans + j]) {
- freelog(LOG_NORMAL, "%s: oceans %d and %d are connected",
+ freelog(LOG_TEST, "%s: oceans %d and %d are connected",
player_name(pplayer), i, j);
}
}
Index: ai/ailog.c
===================================================================
--- ai/ailog.c (revision 14283)
+++ ai/ailog.c (working copy)
@@ -54,7 +54,7 @@
}
if (BV_ISSET(pplayer->debug, PLAYER_DEBUG_TECH)) {
- minlevel = LOG_NORMAL;
+ minlevel = LOG_TEST;
} else if (minlevel > fc_log_level) {
return;
}
@@ -91,7 +91,7 @@
const struct ai_dip_intel *adip;
if (BV_ISSET(pplayer->debug, PLAYER_DEBUG_DIPLOMACY)) {
- minlevel = LOG_NORMAL;
+ minlevel = LOG_TEST;
} else if (minlevel > fc_log_level) {
return;
}
@@ -131,7 +131,7 @@
int minlevel = MIN(LOGLEVEL_CITY, level);
if (pcity->debug) {
- minlevel = LOG_NORMAL;
+ minlevel = LOG_TEST;
} else if (minlevel > fc_log_level) {
return;
}
@@ -170,14 +170,14 @@
bool messwin = FALSE; /* output to message window */
if (punit->debug) {
- minlevel = LOG_NORMAL;
+ minlevel = LOG_TEST;
} else {
/* Are we a virtual unit evaluated in a debug city?. */
if (punit->id == 0) {
struct city *pcity = tile_city(punit->tile);
if (pcity && pcity->debug) {
- minlevel = LOG_NORMAL;
+ minlevel = LOG_TEST;
messwin = TRUE;
}
}
@@ -232,7 +232,7 @@
const char *s = "none";
if (punit->debug) {
- minlevel = LOG_NORMAL;
+ minlevel = LOG_TEST;
} else if (minlevel > fc_log_level) {
return;
}
@@ -316,10 +316,10 @@
my_snprintf(buf, sizeof(buf), " %s: %g sec turn, %g sec game", text, \
read_timer_seconds(aitimer[which][0]), \
read_timer_seconds(aitimer[which][1])); \
- freelog(LOG_NORMAL, buf); \
+ freelog(LOG_TEST, buf); \
notify_conn(NULL, NULL, E_AI_DEBUG, "%s", buf);
- freelog(LOG_NORMAL, " --- AI timing results ---");
+ freelog(LOG_TEST, " --- AI timing results ---");
notify_conn(NULL, NULL, E_AI_DEBUG, " --- AI timing results ---");
OUT("Total AI time", AIT_ALL);
OUT("Movemap", AIT_MOVEMAP);
Index: ai/aiunit.c
===================================================================
--- ai/aiunit.c (revision 14283)
+++ ai/aiunit.c (working copy)
@@ -2319,7 +2319,7 @@
}
emergency = TRUE;
} else {
- int loglevel = pcity->debug ? LOG_NORMAL : LOG_DEBUG;
+ int loglevel = pcity->debug ? LOG_TEST : LOG_DEBUG;
total_defense += best_want;
UNIT_LOG(loglevel, best, "Defending city");
Index: ai/aisettler.c
===================================================================
--- ai/aisettler.c (revision 14283)
+++ ai/aisettler.c (working copy)
@@ -326,7 +326,7 @@
void print_cityresult(struct player *pplayer, struct cityresult *cr,
struct ai_data *ai)
{
- freelog(LOG_NORMAL, "Result=(%d, %d)\nReservations:\n"
+ freelog(LOG_TEST, "Result=(%d, %d)\nReservations:\n"
" %4d %4d %4d \n"
"%4d %4d %4d %4d %4d\n"
"%4d %4d %4d %4d %4d\n"
@@ -344,7 +344,7 @@
cr->citymap[1][4].reserved, cr->citymap[2][4].reserved,
cr->citymap[3][4].reserved);
#define M(a,b) cr->citymap[a][b].food, cr->citymap[a][b].shield,
cr->citymap[a][b].trade
- freelog(LOG_NORMAL, "Tiles (food/shield/trade):\n"
+ freelog(LOG_TEST, "Tiles (food/shield/trade):\n"
" %d-%d-%d %d-%d-%d %d-%d-%d\n"
"%d-%d-%d %d-%d-%d %d-%d-%d %d-%d-%d %d-%d-%d\n"
"%d-%d-%d %d-%d-%d %d-%d-%d %d-%d-%d %d-%d-%d\n"
@@ -354,7 +354,7 @@
M(0,2), M(1,2), M(2,2), M(3,2), M(4,2), M(0,3), M(1,3), M(2,3),
M(3,3), M(4,3), M(1,4), M(2,4), M(3,4));
#undef M
- freelog(LOG_NORMAL, "city center %d + best other(%d, %d) %d - corr %d "
+ freelog(LOG_TEST, "city center %d + best other(%d, %d) %d - corr %d "
"- waste %d\n"
"+ remaining %d + defense bonus %d + naval bonus %d = %d (%d)",
cr->city_center, cr->other_tile->x, cr->other_tile->y,
@@ -362,10 +362,10 @@
cr->corruption, cr->waste, cr->remaining, defense_bonus(cr, ai),
naval_bonus(cr, ai), cr->total, cr->result);
if (food_starvation(cr)) {
- freelog(LOG_NORMAL, " ** FOOD STARVATION **");
+ freelog(LOG_TEST, " ** FOOD STARVATION **");
}
if (shield_starvation(cr)) {
- freelog(LOG_NORMAL, " ** RESOURCE STARVATION **");
+ freelog(LOG_TEST, " ** RESOURCE STARVATION **");
}
}
Index: client/agents/agents.c
===================================================================
--- client/agents/agents.c (revision 14283)
+++ client/agents/agents.c (working copy)
@@ -155,7 +155,7 @@
call_list_prepend(agents.calls, pcall2);
if (DEBUG_TODO_LISTS) {
- freelog(LOG_NORMAL, "A: adding call");
+ freelog(LOG_TEST, "A: adding call");
}
update_turn_done_button_state();
@@ -191,7 +191,7 @@
call_list_unlink(agents.calls, result);
if (DEBUG_TODO_LISTS) {
- freelog(LOG_NORMAL, "A: removed call");
+ freelog(LOG_TEST, "A: removed call");
}
return result;
}
@@ -261,7 +261,7 @@
initialized = TRUE;
}
if (DEBUG_FREEZE) {
- freelog(LOG_NORMAL, "A: freeze() current level=%d", frozen_level);
+ freelog(LOG_TEST, "A: freeze() current level=%d", frozen_level);
}
frozen_level++;
}
@@ -273,7 +273,7 @@
static void thaw(void)
{
if (DEBUG_FREEZE) {
- freelog(LOG_NORMAL, "A: thaw() current level=%d", frozen_level);
+ freelog(LOG_TEST, "A: thaw() current level=%d", frozen_level);
}
frozen_level--;
assert(frozen_level >= 0);
@@ -759,7 +759,7 @@
struct my_agent *agent = find_agent_by_name(agent_name);
if (DEBUG_REQUEST_IDS) {
- freelog(LOG_NORMAL, "A:%s: wait_for_request(ids=[%d..%d])",
+ freelog(LOG_TEST, "A:%s: wait_for_request(ids=[%d..%d])",
agent->agent.name, first_request_id, last_request_id);
}
@@ -778,7 +778,7 @@
(1 + (last_request_id - first_request_id));
if (DEBUG_REQUEST_IDS) {
- freelog(LOG_NORMAL, "A:%s: wait_for_request: ids=[%d..%d]; got it",
+ freelog(LOG_TEST, "A:%s: wait_for_request: ids=[%d..%d]; got it",
agent->agent.name, first_request_id, last_request_id);
}
Index: client/agents/cma_core.c
===================================================================
--- client/agents/cma_core.c (revision 14283)
+++ client/agents/cma_core.c (working copy)
@@ -318,9 +318,9 @@
cm_clear_cache(pcity);
if (SHOW_APPLY_RESULT_ON_SERVER_ERRORS) {
- freelog(LOG_NORMAL, "expected");
+ freelog(LOG_TEST, "expected");
cm_print_result(pcity, result);
- freelog(LOG_NORMAL, "got");
+ freelog(LOG_TEST, "got");
cm_print_result(pcity, ¤t_state);
}
}
@@ -328,7 +328,7 @@
}
/****************************************************************************
- Prints the data of the stats struct via freelog(LOG_NORMAL,...).
+ Prints the data of the stats struct via freelog(LOG_TEST,...).
*****************************************************************************/
static void report_stats(void)
{
@@ -338,7 +338,7 @@
total = stats.apply_result_ignored + stats.apply_result_applied;
per_mill = (stats.apply_result_ignored * 1000) / (total ? total : 1);
- freelog(LOG_NORMAL,
+ freelog(LOG_TEST,
"CMA: apply_result: ignored=%2d.%d%% (%d) "
"applied=%2d.%d%% (%d) total=%d",
per_mill / 10, per_mill % 10, stats.apply_result_ignored,
Index: client/gui-win32/gui_main.c
===================================================================
--- client/gui-win32/gui_main.c (revision 14283)
+++ client/gui-win32/gui_main.c (working copy)
@@ -621,18 +621,18 @@
if ((AlphaBlend = GetProcAddress(hmsimg32, "AlphaBlend"))) {
/* fall through, do nothing */
} else {
- freelog(LOG_NORMAL, "No AlphaBlend() in msimg32.dll, alpha blending
disabled");
+ freelog(LOG_TEST, "No AlphaBlend() in msimg32.dll, alpha blending
disabled");
return FALSE;
}
} else {
- freelog(LOG_NORMAL, "No msimg32.dll, alpha blending disabled");
+ freelog(LOG_TEST, "No msimg32.dll, alpha blending disabled");
return FALSE;
}
hdc = GetDC(map_window);
if (GetDeviceCaps(hdc, BITSPIXEL) < 32) {
- freelog(LOG_NORMAL, "Not running in 32 bit color, alpha blending
disabled");
+ freelog(LOG_TEST, "Not running in 32 bit color, alpha blending disabled");
ReleaseDC(map_window, hdc);
return FALSE;
}
@@ -642,7 +642,7 @@
#define SB_NONE 0
if (GetDeviceCaps(hdc, SHADEBLENDCAPS) == SB_NONE) {
- freelog(LOG_NORMAL, "Device does not support alpha blending, alpha
blending disabled");
+ freelog(LOG_TEST, "Device does not support alpha blending, alpha blending
disabled");
ReleaseDC(map_window, hdc);
return FALSE;
}
Index: client/gui-sdl/gui_main.c
===================================================================
--- client/gui-sdl/gui_main.c (revision 14283)
+++ client/gui-sdl/gui_main.c (working copy)
@@ -657,8 +657,8 @@
case SDL_KEYDOWN:
switch(Main.event.key.keysym.sym) {
case SDLK_PRINT:
- freelog(LOG_NORMAL, _("Making screenshot fc_%05d.bmp"),
schot_nr);
my_snprintf(schot, sizeof(schot), "fc_%05d.bmp", schot_nr++);
+ freelog(LOG_NORMAL, _("Making screenshot %s"), schot);
SDL_SaveBMP(Main.screen, schot);
break;
Index: client/gui-sdl/themespec.c
===================================================================
--- client/gui-sdl/themespec.c (revision 14283)
+++ client/gui-sdl/themespec.c (working copy)
@@ -339,7 +339,7 @@
exit(EXIT_FAILURE);
}
- freelog(LOG_NORMAL, _("Trying \"%s\" theme."), theme->name);
+ freelog(LOG_VERBOSE, "Trying theme \"%s\".", theme->name);
}
/* sz_strlcpy(default_theme_name, theme_get_name(theme));*/
}
@@ -366,7 +366,7 @@
sz_strlcpy(theme_name, name);
sz_strlcpy(old_name, theme->name);
- freelog(LOG_NORMAL, "Loading theme %s.", theme_name);
+ freelog(LOG_NORMAL, _("Loading theme \"%s\"."), theme_name);
/* Step 0: Record old data.
*
Index: client/gui-sdl/dialogs.c
===================================================================
--- client/gui-sdl/dialogs.c (revision 14283)
+++ client/gui-sdl/dialogs.c (working copy)
@@ -208,7 +208,7 @@
void popup_notify_goto_dialog(const char *headline, const char *lines,
struct tile *ptile)
{
- freelog(LOG_NORMAL, "popup_notify_goto_dialog : PORT ME\n \
+ freelog(LOG_ERROR, "popup_notify_goto_dialog() PORT ME\n \
a: %s\nb: %s",headline, lines );
}
Index: client/gui-ftwl/citydlg.c
===================================================================
--- client/gui-ftwl/citydlg.c (revision 14283)
+++ client/gui-ftwl/citydlg.c (working copy)
@@ -26,7 +26,7 @@
**************************************************************************/
void popup_city_dialog(struct city *pcity)
{
- freelog(LOG_NORMAL, "popup_city_dialog('%s')", city_name(pcity));
+ freelog(LOG_ERROR, "popup_city_dialog('%s')", city_name(pcity));
/* PORTME */
}
Index: client/gui-ftwl/mapctrl.c
===================================================================
--- client/gui-ftwl/mapctrl.c (revision 14283)
+++ client/gui-ftwl/mapctrl.c (working copy)
@@ -28,7 +28,7 @@
void popup_newcity_dialog(struct unit *punit, char *suggestname)
{
/* PORTME */
- freelog(LOG_NORMAL, "PORTME: popup_newcity_dialog()");
+ freelog(LOG_ERROR, "PORTME: popup_newcity_dialog()");
}
/**************************************************************************
Index: client/gui-ftwl/mapview.c
===================================================================
--- client/gui-ftwl/mapview.c (revision 14283)
+++ client/gui-ftwl/mapview.c (working copy)
@@ -302,7 +302,7 @@
struct ct_rect rect;
- freelog(LOG_NORMAL, "refresh_overview_canvas()");
+ freelog(LOG_DEBUG, "refresh_overview_canvas()");
whole_map_iterate(x, y) {
overview_update_tile0(x, y);
} whole_map_iterate_end;
@@ -369,7 +369,7 @@
#if 0
/* try to trace that hard-to-find assert that we sometimes get */
- freelog(LOG_NORMAL, "show_city_desc(%s) pcx=%d->%d (%d) pcy=%d->%d (%d)",
city_name(pcity),
+ freelog(LOG_TEST, "show_city_desc(%s) pcx=%d->%d (%d) pcy=%d->%d (%d)",
city_name(pcity),
canvas_x, canvas_x+tileset_tile_width(tileset) / 2, all_rect.width,
canvas_y, canvas_y+tileset_tile_height(tileset), all_rect.height);
#endif
@@ -469,7 +469,7 @@
*rect = (struct ct_rect){ canvas_x, canvas_y, pixel_width, pixel_height };
- //freelog(LOG_NORMAL, "dirty_rect(...)");
+ //freelog(LOG_TEST, "dirty_rect(...)");
region_list_append(region_list, rect);
}
}
@@ -872,7 +872,7 @@
{
char *action = (char *) data;
- freelog(LOG_NORMAL, "action_button_callback(): action '%s' requested",
action);
+ freelog(LOG_VERBOSE, "action_button_callback(): action '%s' requested",
action);
if (strcmp(action, "unit_fortifying") == 0) {
key_unit_fortify();
@@ -927,7 +927,7 @@
} else if (strcmp(action, "unit_done") == 0) {
key_unit_done();
} else {
- freelog(LOG_NORMAL,
+ freelog(LOG_VERBOSE,
"action_button_callback(): action request '%s' not handled", action);
}
}
@@ -1068,7 +1068,7 @@
redraw_selection_rectangle();
}
} else {
- freelog(LOG_NORMAL, "action '%s' requested", action);
+ freelog(LOG_VERBOSE, "action_callback() action '%s' requested", action);
}
}
Index: client/gui-ftwl/gui_main.c
===================================================================
--- client/gui-ftwl/gui_main.c (revision 14283)
+++ client/gui-ftwl/gui_main.c (working copy)
@@ -185,7 +185,9 @@
while (i < argc) {
if (is_option("--help", argv[i])) {
- fc_fprintf(stderr, _(" -d, --dump\t\tEnable screen dumper\n"));
+ fc_fprintf(stderr,
+ " -d, --dump\t\t%s\n",
+ _("Enable screen dumper"));
if (be_supports_fullscreen()) {
fc_fprintf(stderr,
_(" -f, --fullscreen\t"
@@ -202,7 +204,7 @@
DEFAULT_THEME);
exit(EXIT_SUCCESS);
} else if (is_option("--dump", argv[i])) {
- freelog(LOG_NORMAL, "enabling screen dumper");
+ freelog(LOG_VERBOSE, "Enable screen dumper");
sw_set_dump_screen(TRUE);
} else if (is_option("--fullscreen", argv[i])) {
fullscreen = TRUE;
@@ -215,13 +217,13 @@
theme = mystrdup(option);
free(option);
} else {
- freelog(LOG_ERROR, "unknown option '%s'", argv[i]);
+ freelog(LOG_ERROR, _("Unknown option \"%s\""), argv[i]);
}
i++;
}
if (sscanf(resolution, "%dx%d", &res.width, &res.height) != 2) {
- freelog(LOG_ERROR, "The resolution '%s' doesn't parse", resolution);
+ freelog(LOG_ERROR, _("Resolution \"%s\" doesn't parse"), resolution);
}
free(resolution);
Index: client/gui-ftwl/chat.c
===================================================================
--- client/gui-ftwl/chat.c (revision 14283)
+++ client/gui-ftwl/chat.c (working copy)
@@ -236,7 +236,7 @@
struct color *pcolor = color_alloc(0, 0, 0);
struct player *pplayer=NULL;
- freelog(LOG_NORMAL,"ogg_add(%d,%s)",conn_id, astring);
+ freelog(LOG_VERBOSE,"ogg_add(%d,%s)",conn_id, astring);
if (output.window) {
sw_window_resize(output.window, output.outer_bounds.width,
@@ -251,7 +251,7 @@
pcolor = get_player_color(tileset, pplayer);
}
- freelog(LOG_NORMAL, "id=%d conn=%p player=%s", conn_id, conn,
+ freelog(LOG_VERBOSE, "id=%d conn=%p player=%s", conn_id, conn,
pplayer ? player_name(pplayer) : "none");
string = ct_string_clone4(output.template, astring, pcolor->color);
Index: client/gui-ftwl/gui_text.c
===================================================================
--- client/gui-ftwl/gui_text.c (revision 14283)
+++ client/gui-ftwl/gui_text.c (working copy)
@@ -323,7 +323,8 @@
#endif
add_line("tooltip for action %s isn't written yet",
action);
- freelog(LOG_NORMAL, "warning: get_unit_action_tooltip: unknown action %s",
+ freelog(LOG_VERBOSE,
+ "warning: get_unit_action_tooltip: unknown action %s",
action);
}
RETURN;
@@ -348,7 +349,7 @@
city_production_turns_to_build(pcity, TRUE));
} else {
add_line("tooltip for action %s isn't written yet", action);
- freelog(LOG_NORMAL,
+ freelog(LOG_VERBOSE,
"warning: get_city_action_tooltip: unknown action %s", action);
}
RETURN;
Index: client/audio.c
===================================================================
--- client/audio.c (revision 14283)
+++ client/audio.c (working copy)
@@ -251,10 +251,9 @@
#ifdef AUDIO_SDL
if (audio_select_plugin("sdl")) return;
#endif
+ freelog(LOG_NORMAL, _("No real audio subsystem managed to initialize!"));
freelog(LOG_NORMAL,
- _("No real audio subsystem managed to initialize!"));
- freelog(LOG_NORMAL,
- _("Perhaps there is some misconfiguration or bad permissions"));
+ _("Perhaps there is some misconfiguration or bad permissions."));
freelog(LOG_NORMAL, _("Proceeding with sound support disabled."));
}
Index: client/tilespec.c
===================================================================
--- client/tilespec.c (revision 14283)
+++ client/tilespec.c (working copy)
@@ -876,7 +876,7 @@
exit(EXIT_FAILURE);
}
- freelog(LOG_VERBOSE, "Trying \"%s\" tileset.", tileset->name);
+ freelog(LOG_VERBOSE, "Trying tileset \"%s\".", tileset->name);
}
sz_strlcpy(default_tileset_name, tileset_get_name(tileset));
}
@@ -1634,7 +1634,7 @@
}
if (!hash_insert(t->tile_hash, draw->name, draw)) {
- freelog(LOG_NORMAL, "warning: duplicate tilespec entry [%s].",
+ freelog(LOG_ERROR, "warning: duplicate tilespec entry [%s].",
sections[i]);
section_file_free(file);
free(fname);
Index: client/clinet.c
===================================================================
--- client/clinet.c (revision 14283)
+++ client/clinet.c (working copy)
@@ -140,8 +140,8 @@
close_socket_nomessage(pc);
/* If we lost connection to the internal server - kill him */
client_kill_server(TRUE);
+ freelog(LOG_NORMAL, _("Lost connection to server!"));
append_output_window(_("Lost connection to server!"));
- freelog(LOG_NORMAL, "lost connection to server");
if (with_ggz) {
client_exit();
}
@@ -345,7 +345,7 @@
continue;
}
- freelog(LOG_NORMAL, "error in select() return=%d errno=%d (%s)",
+ freelog(LOG_ERROR, "select() return=%d errno=%d (%s)",
n, errno, mystrerror());
return -1;
}
Index: client/civclient.c
===================================================================
--- client/civclient.c (revision 14283)
+++ client/civclient.c (working copy)
@@ -570,7 +570,7 @@
gui_server_connect();
if (auto_connect) {
if (connect_error) {
- freelog(LOG_NORMAL,
+ freelog(LOG_FATAL,
_("There was an error while auto connecting; aborting."));
exit(EXIT_FAILURE);
} else {
Index: client/climisc.c
===================================================================
--- client/climisc.c (revision 14283)
+++ client/climisc.c (working copy)
@@ -876,7 +876,7 @@
if (event >= E_LAST) {
/* Server may have added a new event; leave as MW_OUTPUT */
- freelog(LOG_NORMAL, "Unknown event type %d!", event);
+ freelog(LOG_VERBOSE, "Unknown event type %d!", event);
} else if (event >= 0) {
where = messages_where[event];
}
_______________________________________________
Freeciv-dev mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-dev
