forked from github/server
kleine compile-fixes
This commit is contained in:
parent
db1a75f032
commit
97bec20e4b
|
@ -1492,7 +1492,7 @@ readfaction(FILE * F)
|
||||||
int planes;
|
int planes;
|
||||||
int i = rid(F);
|
int i = rid(F);
|
||||||
faction * f = findfaction(i);
|
faction * f = findfaction(i);
|
||||||
char * email;
|
char * email = NULL;
|
||||||
|
|
||||||
if (f==NULL) {
|
if (f==NULL) {
|
||||||
f = (faction *) calloc(1, sizeof(faction));
|
f = (faction *) calloc(1, sizeof(faction));
|
||||||
|
|
|
@ -348,9 +348,7 @@ guardian_faction(plane * pl, int id)
|
||||||
f->banner = strdup("Sie dienen dem großen Wyrm");
|
f->banner = strdup("Sie dienen dem großen Wyrm");
|
||||||
f->passw = strdup(itoa36(rand()));
|
f->passw = strdup(itoa36(rand()));
|
||||||
f->override = strdup(itoa36(rand()));
|
f->override = strdup(itoa36(rand()));
|
||||||
if (set_email(&f->email, "igjarjuk@eressea.de")!=0) {
|
set_email(&f->email, "igjarjuk@eressea.de");
|
||||||
log_error(("Invalid email address: %s\n", email));
|
|
||||||
}
|
|
||||||
f->name = strdup("Igjarjuks Kundschafter");
|
f->name = strdup("Igjarjuks Kundschafter");
|
||||||
f->race = new_race[RC_ILLUSION];
|
f->race = new_race[RC_ILLUSION];
|
||||||
f->age = turn;
|
f->age = turn;
|
||||||
|
|
|
@ -140,7 +140,7 @@ spc_email_isvalid(const char *address)
|
||||||
{
|
{
|
||||||
int count = 0;
|
int count = 0;
|
||||||
const char *c, *domain;
|
const char *c, *domain;
|
||||||
static char *rfc822_specials = "()<>@,;:\\\"[]";
|
static const char *rfc822_specials = "()<>@,;:\\\"[]";
|
||||||
|
|
||||||
/* first we validate the name portion (name@domain) */
|
/* first we validate the name portion (name@domain) */
|
||||||
for (c = address; *c; c++) {
|
for (c = address; *c; c++) {
|
||||||
|
@ -188,4 +188,4 @@ set_email(char** pemail, const char *newmail)
|
||||||
*pemail = strdup(newmail);
|
*pemail = strdup(newmail);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,8 @@
|
||||||
#include <kernel/unit.h>
|
#include <kernel/unit.h>
|
||||||
|
|
||||||
/* util includes */
|
/* util includes */
|
||||||
#include <base36.h>
|
#include <util/base36.h>
|
||||||
|
#include <util/goodies.h>
|
||||||
#include <language.h>
|
#include <language.h>
|
||||||
|
|
||||||
/* libc includes */
|
/* libc includes */
|
||||||
|
|
|
@ -60,7 +60,8 @@
|
||||||
#include <kernel/xmlreader.h>
|
#include <kernel/xmlreader.h>
|
||||||
|
|
||||||
/* util includes */
|
/* util includes */
|
||||||
#include <base36.h>
|
#include <util/base36.h>
|
||||||
|
#include <util/goodies.h>
|
||||||
|
|
||||||
/* libc includes */
|
/* libc includes */
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
Loading…
Reference in New Issue