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

* Some tidying up in mail.c

Browse Source 
* Added an invalid pointer check in clif_displaymessage

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1320 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
celest 2005-03-29 03:37:06 +00:00
parent a47526d812
commit 5927adb9bd
3 changed files with 71 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-SVN.txt
View File

@ -1,6 +1,8 @@
Date Added
03/29
* Some tidying up in mail.c [celest]
* Added an invalid pointer check in clif_displaymessage [celest]
* Added sql upgrade file in sql-files for svn1315's update [celest]
* Added auto create 'save' folder from 'save-tmpl' when compiling for the
first time, thanks to Jbain

3
src/map/clif.c
View File

@ -4713,6 +4713,9 @@ int clif_status_change(struct block_list *bl,int type,int flag)
*/
int clif_displaymessage(const int fd, char* mes)
{
// invalid pointer?
nullpo_retr(-1, mes);
//Console [Wizputer]
if (fd == 0)
printf("\033[0;36mConsole: \033[0m\033[1m%s\033[0m\n", mes);

33
src/map/mail.c
View File

@ -30,13 +30,13 @@ extern char msg_table[1000][256]; // Server messages (0-499 reserved for GM comm
int mail_check(struct map_session_data *sd,int type)
{
int i=0,new_=0,priority=0;
int i = 0, new_ = 0, priority = 0;
char message[50];
if(sd==NULL)
return 0;
nullpo_retr (0, sd);
sprintf(tmp_msql,"SELECT `message_id`,`to_account_id`,`from_char_name`,`read_flag`,`priority`,`check_flag` FROM `%s` WHERE `to_account_id` = \"%d\" ORDER by `message_id`", mail_db, sd->status.account_id);
sprintf(tmp_msql,"SELECT `message_id`,`to_account_id`,`from_char_name`,`read_flag`,`priority`,`check_flag"
"FROM `%s` WHERE `to_account_id` = \"%d\" ORDER by `message_id`", mail_db, sd->status.account_id);
if (mysql_query(&mail_handle, tmp_msql)) {
printf("Database server error (executing query for %s): %s\n", mail_db, mysql_error(&mail_handle));
@ -55,7 +55,6 @@ int mail_check(struct map_session_data *sd,int type)
while ((mail_row = mysql_fetch_row(mail_res))) {
i++;
if(!atoi(mail_row[5])) {
sprintf(tmp_msql,"UPDATE `%s` SET `check_flag`='1' WHERE `message_id`= \"%d\"", mail_db, atoi(mail_row[0]));
if(mysql_query(&mail_handle, tmp_msql) ) {
@ -73,26 +72,20 @@ int mail_check(struct map_session_data *sd,int type)
sprintf(message, msg_table[511], i, mail_row[2]);
clif_displaymessage(sd->fd, jstrescape(message));
}
else {
} else {
//sprintf(message, "%d - From : %s (New)", i, mail_row[2]);
sprintf(message, msg_table[512], i, mail_row[2]);
clif_displaymessage(sd->fd, jstrescape(message));
}
}
}
else if(type==2){
} else if(type==2){
//sprintf(message, "%d - From : %s", i, mail_row[2]);
sprintf(message, msg_table[513], i, mail_row[2]);
clif_displaymessage(sd->fd, jstrescape(message));
}
}
mysql_free_result(mail_res);
} else {
printf("MySQL error (storing query result for %s): %s\n", mail_db, mysql_error(&mail_handle));
return 0;
@ -122,8 +115,7 @@ int mail_read(struct map_session_data *sd, int message_id)
char message[80];
if(sd==NULL)
return 0;
nullpo_retr (0, sd);
sprintf(tmp_msql,"SELECT `message_id`,`to_account_id`,`from_char_name`,`message`,`read_flag`,`priority`,`check_flag` from `%s` WHERE `to_account_id` = \"%d\" ORDER by `message_id` LIMIT %d, 1",mail_db,sd->status.account_id,message_id-1);
@ -142,7 +134,6 @@ int mail_read(struct map_session_data *sd, int message_id)
}
if ((mail_row = mysql_fetch_row(mail_res))) {
if(!atoi(mail_row[6])) {
sprintf(tmp_msql,"UPDATE `%s` SET `check_flag`='1' WHERE `message_id`= \"%d\"", mail_db, atoi(mail_row[0]));
if(mysql_query(&mail_handle, tmp_msql) ) {
@ -167,7 +158,6 @@ int mail_read(struct map_session_data *sd, int message_id)
} else {
printf("MySQL error (storing query result for %s): %s\n", mail_db, mysql_error(&mail_handle));
return 0;
}
return 0;
@ -175,8 +165,7 @@ int mail_read(struct map_session_data *sd, int message_id)
int mail_delete(struct map_session_data *sd, int message_id)
{
if(sd==NULL)
return 0;
nullpo_retr (0, sd);
sprintf(tmp_msql,"SELECT `message_id`,`to_account_id`,`read_flag`,`priority`,`check_flag` from `%s` WHERE `to_account_id` = \"%d\" ORDER by `message_id` LIMIT %d, 1",mail_db,sd->status.account_id,message_id-1);
@ -222,7 +211,6 @@ int mail_delete(struct map_session_data *sd, int message_id)
} else {
printf("MySQL error (delete query result for %s): %s\n", mail_db, mysql_error(&mail_handle));
return 0;
}
return 0;
@ -230,8 +218,7 @@ int mail_delete(struct map_session_data *sd, int message_id)
int mail_send(struct map_session_data *sd, char *name, char *message, int flag)
{
if(sd==NULL)
return 0;
nullpo_retr (0, sd);
if(pc_isGM(sd) < 80 && sd->mail_counter > 0) {
//clif_displaymessage(sd->fd,"You must wait 10 minutes before sending another message");
@ -282,7 +269,6 @@ int mail_send(struct map_session_data *sd, char *name, char *message, int flag)
printf("DB server Error (insert `mail_db`)- %s\n", mysql_error(&mail_handle) );
return 0;
}
}
}
@ -311,7 +297,6 @@ int mail_check_timer(int tid,unsigned int tick,int id,int data)
mail_res = mysql_store_result(&mail_handle);
if (mail_res) {
if (mysql_num_rows(mail_res) == 0) {
mysql_free_result(mail_res);
mail_timer=add_timer(gettick()+MAIL_CHECK_TIME,mail_check_timer,0,0);