Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

broken format string for strftime

This commit is contained in:
Enno Rehling 2001-05-18 07:06:47 +00:00
parent 002a2fc628
commit de69d13259
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/gamecode/report.c
View File

@ -712,7 +712,7 @@ rpunit(FILE * F, const faction * f, const unit * u, int indent, int mode)
for(i=0; i<ug->members; i++) { for(i=0; i<ug->members; i++) {
print_curses(F, u, TYP_UNIT, ug->unit_array[i]->attribs, (u->faction == f)? 1 : 0, indent); print_curses(F, u, TYP_UNIT, ug->unit_array[i]->attribs, (u->faction == f)? 1 : 0, indent);
} }
} else } else
#endif /* USE_UGROUPS */ #endif /* USE_UGROUPS */
print_curses(F, u, TYP_UNIT, u->attribs, (u->faction == f)? 1 : 0, indent); print_curses(F, u, TYP_UNIT, u->attribs, (u->faction == f)? 1 : 0, indent);
} }
@ -2019,18 +2019,18 @@ report(FILE *F, faction * f, const char * pzTime)
(w + 99) / 100, /* +99 weil sonst die Nachkommastellen ignoriert würden */ (w + 99) / 100, /* +99 weil sonst die Nachkommastellen ignoriert würden */
shipcapacity(sh) / 100); shipcapacity(sh) / 100);
} else { } else {
sprintf(buf, "%s, %s", shipname(sh), sprintf(buf, "%s, %s", shipname(sh),
LOC(f->locale, sh->type->name[0])); LOC(f->locale, sh->type->name[0]));
} }
assert(sh->type->construction->improvement==NULL); /* sonst ist construction::size nicht ship_type::maxsize */ assert(sh->type->construction->improvement==NULL); /* sonst ist construction::size nicht ship_type::maxsize */
if (sh->size!=sh->type->construction->maxsize) { if (sh->size!=sh->type->construction->maxsize) {
sprintf(buf+strlen(buf), ", %s (%d/%d)", sprintf(buf+strlen(buf), ", %s (%d/%d)",
LOC(f->locale, "nr_undercons"), sh->size, LOC(f->locale, "nr_undercons"), sh->size,
sh->type->construction->maxsize); sh->type->construction->maxsize);
} }
if (sh->damage) { if (sh->damage) {
sprintf(buf+strlen(buf), ", %d%% %s", sprintf(buf+strlen(buf), ", %d%% %s",
sh->damage*100/(sh->size*DAMAGE_SCALE), sh->damage*100/(sh->size*DAMAGE_SCALE),
LOC(f->locale, "nr_damaged")); LOC(f->locale, "nr_damaged"));
} }
@ -2580,9 +2580,9 @@ reports(void)
#ifdef _GNU_SOURCE #ifdef _GNU_SOURCE
strftime(pzTime, 64, "%A, %-e. %B %Y, %-k:%M", localtime(&ltime)); strftime(pzTime, 64, "%A, %-e. %B %Y, %-k:%M", localtime(&ltime));
#else #else
strftime(pzTime, 64, "%A, %e. %B %Y, %k:%M", localtime(&ltime)); strftime(pzTime, 64, "%A, %d. %B %Y, %H:%M", localtime(&ltime));
#endif #endif
nmr_warnings(); nmr_warnings();
#ifdef DMALLOC #ifdef DMALLOC
assert(dmalloc_verify ( NULL )); assert(dmalloc_verify ( NULL ));