Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed some compiling warnings.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10196 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-04-09 19:09:30 +00:00
parent d6b4625e06
commit 8e93386102
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/malloc.c
View File

@ -575,8 +575,8 @@ static void memmgr_final (void)
{ {
#ifdef LOG_MEMMGR #ifdef LOG_MEMMGR
sprintf (buf, sprintf (buf,
"%04d : %s line %d size %d\n", ++count, "%04d : %s line %d size %lu\n", ++count,
head->file, head->line, head->size); head->file, head->line, (unsigned long)head->size);
memmgr_log (buf); memmgr_log (buf);
#endif #endif
// get block pointer and free it [celest] // get block pointer and free it [celest]
@ -623,8 +623,8 @@ static void memmgr_final (void)
large2 = large->next; large2 = large->next;
#ifdef LOG_MEMMGR #ifdef LOG_MEMMGR
sprintf (buf, sprintf (buf,
"%04d : %s line %d size %d\n", ++count, "%04d : %s line %d size %lu\n", ++count,
large->unit_head.file, large->unit_head.line, large->unit_head.size); large->unit_head.file, large->unit_head.line, (unsigned long)large->unit_head.size);
memmgr_log (buf); memmgr_log (buf);
#endif #endif
FREE(large,file,line,func); FREE(large,file,line,func);

4
src/ladmin/ladmin.c
View File

@ -2198,11 +2198,11 @@ int changememo(char* param) {
if (strlen(memo) > 254) { if (strlen(memo) > 254) {
if (defaultlanguage == 'F') { if (defaultlanguage == 'F') {
printf("Mémo trop long (%d caractères).\n", strlen(memo)); printf("Mémo trop long (%lu caractères).\n", (unsigned long)strlen(memo));
printf("Entrez un mémo de 254 caractères maximum svp.\n"); printf("Entrez un mémo de 254 caractères maximum svp.\n");
ladmin_log("Mémo trop long (%d caractères). Entrez un mémo de 254 caractères maximum svp." RETCODE, strlen(memo)); ladmin_log("Mémo trop long (%d caractères). Entrez un mémo de 254 caractères maximum svp." RETCODE, strlen(memo));
} else { } else {
printf("Memo is too long (%d characters).\n", strlen(memo)); printf("Memo is too long (%lu characters).\n", (unsigned long)strlen(memo));
printf("Please input a memo of 254 bytes at the maximum.\n"); printf("Please input a memo of 254 bytes at the maximum.\n");
ladmin_log("Email is too long (%d characters). Please input a memo of 254 bytes at the maximum." RETCODE, strlen(memo)); ladmin_log("Email is too long (%d characters). Please input a memo of 254 bytes at the maximum." RETCODE, strlen(memo));
} }

6
src/login/login.c
View File

@ -1940,7 +1940,7 @@ int parse_fromchar(int fd)
time(&raw_time); time(&raw_time);
strftime(tmpstr, 23, date_format, localtime(&raw_time)); strftime(tmpstr, 23, date_format, localtime(&raw_time));
fprintf(logfp, "%s: receiving of an unknown packet -> disconnection" RETCODE, tmpstr); fprintf(logfp, "%s: receiving of an unknown packet -> disconnection" RETCODE, tmpstr);
fprintf(logfp, "parse_fromchar: connection #%d (ip: %s), packet: 0x%x (with being read: %d)." RETCODE, fd, ip, RFIFOW(fd,0), RFIFOREST(fd)); fprintf(logfp, "parse_fromchar: connection #%d (ip: %s), packet: 0x%x (with being read: %lu)." RETCODE, fd, ip, RFIFOW(fd,0), (unsigned long)RFIFOREST(fd));
fprintf(logfp, "Detail (in hex):" RETCODE); fprintf(logfp, "Detail (in hex):" RETCODE);
fprintf(logfp, "---- 00-01-02-03-04-05-06-07 08-09-0A-0B-0C-0D-0E-0F" RETCODE); fprintf(logfp, "---- 00-01-02-03-04-05-06-07 08-09-0A-0B-0C-0D-0E-0F" RETCODE);
memset(tmpstr, '\0', sizeof(tmpstr)); memset(tmpstr, '\0', sizeof(tmpstr));
@ -2906,7 +2906,7 @@ int parse_admin(int fd)
time(&raw_time); time(&raw_time);
strftime(tmpstr, 23, date_format, localtime(&raw_time)); strftime(tmpstr, 23, date_format, localtime(&raw_time));
fprintf(logfp, "%s: receiving of an unknown packet -> disconnection" RETCODE, tmpstr); fprintf(logfp, "%s: receiving of an unknown packet -> disconnection" RETCODE, tmpstr);
fprintf(logfp, "parse_admin: connection #%d (ip: %s), packet: 0x%x (with being read: %d)." RETCODE, fd, ip, RFIFOW(fd,0), RFIFOREST(fd)); fprintf(logfp, "parse_admin: connection #%d (ip: %s), packet: 0x%x (with being read: %lu)." RETCODE, fd, ip, RFIFOW(fd,0), (unsigned long)RFIFOREST(fd));
fprintf(logfp, "Detail (in hex):" RETCODE); fprintf(logfp, "Detail (in hex):" RETCODE);
fprintf(logfp, "---- 00-01-02-03-04-05-06-07 08-09-0A-0B-0C-0D-0E-0F" RETCODE); fprintf(logfp, "---- 00-01-02-03-04-05-06-07 08-09-0A-0B-0C-0D-0E-0F" RETCODE);
memset(tmpstr, '\0', sizeof(tmpstr)); memset(tmpstr, '\0', sizeof(tmpstr));
@ -3333,7 +3333,7 @@ int parse_login(int fd)
time(&raw_time); time(&raw_time);
strftime(tmpstr, 23, date_format, localtime(&raw_time)); strftime(tmpstr, 23, date_format, localtime(&raw_time));
fprintf(logfp, "%s: receiving of an unknown packet -> disconnection" RETCODE, tmpstr); fprintf(logfp, "%s: receiving of an unknown packet -> disconnection" RETCODE, tmpstr);
fprintf(logfp, "parse_login: connection #%d (ip: %s), packet: 0x%x (with being read: %d)." RETCODE, fd, ip, RFIFOW(fd,0), RFIFOREST(fd)); fprintf(logfp, "parse_login: connection #%d (ip: %s), packet: 0x%x (with being read: %lu)." RETCODE, fd, ip, RFIFOW(fd,0), (unsigned long)RFIFOREST(fd));
fprintf(logfp, "Detail (in hex):" RETCODE); fprintf(logfp, "Detail (in hex):" RETCODE);
fprintf(logfp, "---- 00-01-02-03-04-05-06-07 08-09-0A-0B-0C-0D-0E-0F" RETCODE); fprintf(logfp, "---- 00-01-02-03-04-05-06-07 08-09-0A-0B-0C-0D-0E-0F" RETCODE);
memset(tmpstr, '\0', sizeof(tmpstr)); memset(tmpstr, '\0', sizeof(tmpstr));

4
src/map/npc.c
View File

@ -1206,8 +1206,8 @@ int npc_scriptcont(struct map_session_data *sd,int id)
TBL_NPC* nd_sd=(TBL_NPC*)map_id2bl(sd->npc_id); TBL_NPC* nd_sd=(TBL_NPC*)map_id2bl(sd->npc_id);
TBL_NPC* nd=(TBL_NPC*)map_id2bl(id); TBL_NPC* nd=(TBL_NPC*)map_id2bl(id);
ShowDebug("npc_scriptcont: %s (sd->npc_id=%d) is not %s (id=%d).\n", ShowDebug("npc_scriptcont: %s (sd->npc_id=%d) is not %s (id=%d).\n",
nd_sd?nd_sd->name:"'Unknown NPC'", sd->npc_id, nd_sd?(char*)nd_sd->name:"'Unknown NPC'", (int)sd->npc_id,
nd?nd->name:"'Unknown NPC'", id); nd?(char*)nd->name:"'Unknown NPC'", (int)id);
return 1; return 1;
} }