Replace debug printf() calls with WARNING()

This commit is contained in:
kichikuou
2022-09-08 21:19:19 +09:00
parent 307bb2623b
commit b53c82e072
13 changed files with 85 additions and 100 deletions
+8 -8
View File
@@ -35,41 +35,41 @@ int musbgm_reset(void) {
}
int musbgm_play(int no, int time, int vol) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
int musbgm_stop(int no, int time) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
int musbgm_fade(int no, int time, int vol) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
int musbgm_getpos(int no) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return 0;
}
int musbgm_getlen(int no) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return 0;
}
int musbgm_isplaying(int no) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return 0;
}
int musbgm_stopall(int time) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
int musbgm_wait(int no, int timeout) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
+17 -15
View File
@@ -21,6 +21,7 @@
*/
/* $Id: cdrom.FreeBSD.c,v 1.17 2002/08/18 09:35:29 chikama Exp $ */
#include <errno.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
@@ -32,6 +33,7 @@
#include "portab.h"
#include "cdrom.h"
#include "music_private.h"
#include "system.h"
static int cdrom_init(char *);
static int cdrom_exit(void);
@@ -79,14 +81,14 @@ static int get_cd_entry() {
/* 最終トラック番号を得る */
if (do_ioctl(CDIOREADTOCHEADER, &tochdr) < 0) {
perror("CDIOREADTOCHEADER");
WARNING("CDIOREADTOCHEADER: %s", strerror(errno));
return NG;
}
lastindex = endtrk = tochdr.ending_track;
i = tochdr.ending_track - tochdr.starting_track + 1;
if (endtrk <= 1) { /* 2トラック以上ないとダメ */
fprintf(stderr, "No CD-AUDIO in CD-ROM\n");
WARNING("No CD-AUDIO in CD-ROM");
return NG;
}
@@ -98,7 +100,7 @@ static int get_cd_entry() {
toc.data_len = (i + 1) * sizeof(struct cd_toc_entry);
toc.data = toc_buffer;
if (do_ioctl(CDIOREADTOCENTRYS, &toc) < 0) {
perror("CDIOREADTOCENTRYS");
WARNING("CDIOREADTOCENTRYS: %s", strerror(errno));
return NG;
}
@@ -115,13 +117,13 @@ static int get_cd_entry() {
msf.end_s = toc_buffer[2].addr.msf.second;
msf.end_f = toc_buffer[2].addr.msf.frame;
if (do_ioctl(CDIOCPLAYMSF, &msf) < 0) {
perror("CDIOPLAYMSF");
fprintf(stderr, "CD-ROM: change TRKMODE\n");
WARNING("CDIOPLAYMSF: %s", strerror(errno));
WARNING("CD-ROM: change TRKMODE");
msfmode = FALSE;
}
/* stop */
if (do_ioctl(CDIOCSTOP, NULL) < 0) {
perror("CDIOCSTOP");
WARNING("CDIOCSTOP: %s", strerror(errno));
return NG;
}
return OK;
@@ -132,7 +134,7 @@ int cdrom_init(char *dev_cd) {
if (dev_cd == NULL) return NG;
if ((cd_fd = open(dev_cd, O_RDONLY, 0)) < 0) {
perror("CDROM_DEVICE OPEN");
WARNING("CDROM_DEVICE OPEN: %s", strerror(errno));
enabled = FALSE;
return NG;
}
@@ -169,9 +171,9 @@ int cdrom_start(int trk, int loop) {
return NG;
}
/* drive spin up */
if (do_ioctl(CDIOCSTART, NULL) < 0) {
perror("CDIOCSTART");
return NG;
if (do_ioctl(CDIOCSTART, NULL) < 0) {
WARNING("CDIOCSTART: %s", strerror(errno));
return NG;
}
if (msfmode) {
msf.start_m = toc_buffer[trk - 1].addr.msf.minute;
@@ -181,14 +183,14 @@ int cdrom_start(int trk, int loop) {
msf.end_s = toc_buffer[trk].addr.msf.second;
msf.end_f = toc_buffer[trk].addr.msf.frame;
if (do_ioctl(CDIOCPLAYMSF, &msf) < 0) {
perror("CDIOPLAYMSF");
WARNING("CDIOPLAYMSF: %s", strerror(errno));
return NG;
}
} else {
track.start_track = track.end_track = trk;
track.start_index = track.end_index = 0;
if (do_ioctl(CDIOCPLAYTRACKS, &track) < 0) {
perror("CDIOCPLAYTRACKS");
WARNING("CDIOCPLAYTRACKS: %s", strerror(errno));
return NG;
}
}
@@ -200,8 +202,8 @@ int cdrom_stop() {
if (enabled) {
/* if (do_ioctl(CDIOCSTOP, NULL) < 0) { */
if (do_ioctl(CDIOCPAUSE, NULL) < 0) {
/* perror("CDIOCSTOP"); */
perror("CDIOCPAUSE");
/* WARNING("CDIOCSTOP: %s", strerror(errno)); */
WARNING("CDIOCPAUSE: %s", strerror(errno));
}
return OK;
}
@@ -222,7 +224,7 @@ int cdrom_getPlayingInfo (cd_time *info) {
s.address_format = CD_MSF_FORMAT;
s.data_format = CD_CURRENT_POSITION;
if (do_ioctl(CDIOCREADSUBCHANNEL, &s) < 0) {
perror("CDIOCREADSUBCHANNEL");
WARNING("CDIOCREADSUBCHANNEL: %s", strerror(errno));
return NG;
}
if (s.data->header.audio_status != CD_AS_PLAY_IN_PROGRESS) {
+19 -16
View File
@@ -21,9 +21,11 @@
*/
/* $Id: cdrom.Linux.c,v 1.18 2002/08/18 09:35:29 chikama Exp $ */
#include <errno.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
#include <fcntl.h>
@@ -41,6 +43,7 @@ struct cdrom_msf0 {
#include "portab.h"
#include "cdrom.h"
#include "music_private.h"
#include "system.h"
static int cdrom_init(char *);
static int cdrom_exit(void);
@@ -89,12 +92,12 @@ static int get_cd_entry() {
/* 最終トラック番号を得る */
if (do_ioctl(CDROMREADTOCHDR, &tochdr) < 0) {
perror("CDROMREADTOCHDR");
WARNING("CDROMREADTOCHDR: %s", strerror(errno));
return NG;
}
lastindex = endtrk = tochdr.cdth_trk1;
if (endtrk <= 1) { /* 2トラック以上ないとダメ */
fprintf(stderr, "No CD-AUDIO in CD-ROM\n");
WARNING("No CD-AUDIO in CD-ROM");
return NG;
}
@@ -105,7 +108,7 @@ static int get_cd_entry() {
for (i = 1; i <= endtrk; i++) {
toc.cdte_track = i;
if (do_ioctl(CDROMREADTOCENTRY, &toc) < 0) {
perror("CDROMREADTOCENTRY");
WARNING("CDROMREADTOCENTRY: %s", strerror(errno));
return NG;
}
tocmsf[i - 1].minute = toc.cdte_addr.msf.minute;
@@ -115,7 +118,7 @@ static int get_cd_entry() {
/* リードアウトを読み出す */
toc.cdte_track = CDROM_LEADOUT;
if (do_ioctl(CDROMREADTOCENTRY, &toc) < 0) {
perror("CDROMREADTOCENTRY");
WARNING("CDROMREADTOCENTRY: %s", strerror(errno));
return NG;
}
@@ -146,13 +149,13 @@ static int get_cd_entry() {
msf.cdmsf_sec1 = tocmsf[2].second;
msf.cdmsf_frame1 = tocmsf[2].frame;
if (do_ioctl(CDROMPLAYMSF, &msf) < 0) {
perror("CDROMPLAYMSF");
fprintf(stderr, "CD-ROM: change TRKIND mode\n");
WARNING("CDROMPLAYMSF: %s", strerror(errno));
WARNING("CD-ROM: change TRKIND mode");
msfmode = FALSE;
}
/* stop */
if (do_ioctl(CDROMSTOP, NULL) < 0) {
perror("CDROMSTOP");
WARNING("CDROMSTOP: %s", strerror(errno));
return NG;
}
return OK;
@@ -163,7 +166,7 @@ static int cdrom_init(char *dev_cd) {
if (dev_cd == NULL) return NG;
if ((cd_fd = open(dev_cd, O_RDONLY, 0)) < 0) {
perror("CDROM_DEVICE OPEN");
WARNING("CDROM_DEVICE OPEN: %s", strerror(errno));
enabled = FALSE;
return NG;
}
@@ -200,9 +203,9 @@ static int cdrom_start(int trk, int loop) {
return NG;
}
/* drive spin up */
if (do_ioctl(CDROMSTART, NULL) < 0) {
perror("CDROMSTART");
return NG;
if (do_ioctl(CDROMSTART, NULL) < 0) {
WARNING("CDROMSTART: %s", strerror(errno));
return NG;
}
if (msfmode) {
@@ -213,7 +216,7 @@ static int cdrom_start(int trk, int loop) {
msf.cdmsf_sec1 = tocmsf[trk].second;
msf.cdmsf_frame1 = tocmsf[trk].frame;
if (do_ioctl(CDROMPLAYMSF, &msf) < 0) {
perror("CDROMPLAYMSF");
WARNING("CDROMPLAYMSF: %s", strerror(errno));
return NG;
}
return OK;
@@ -221,7 +224,7 @@ static int cdrom_start(int trk, int loop) {
ti.cdti_trk0 = ti.cdti_trk1 = trk;
ti.cdti_ind0 = ti.cdti_ind1 = 0;
if (do_ioctl(CDROMPLAYTRKIND, &ti) < 0) {
perror("CDROMPLAYTRKIND");
WARNING("CDROMPLAYTRKIND: %s", strerror(errno));
return NG;
}
return OK;
@@ -233,8 +236,8 @@ static int cdrom_stop() {
if (enabled) {
/* if (do_ioctl(CDROMSTOP, NULL) < 0) { */
if (do_ioctl(CDROMPAUSE, NULL) < 0) {
/* perror("CDROMSTOP"); */
perror("CDROMPAUSE");
/* WARNING("CDROMSTOP: %s", strerror(errno)); */
WARNING("CDROMPAUSE: %s", strerror(errno));
return NG;
}
return OK;
@@ -251,7 +254,7 @@ static int cdrom_getPlayingInfo (cd_time *info) {
sc.cdsc_format = CDROM_MSF;
if (do_ioctl(CDROMSUBCHNL, &sc) < 0) {
perror("CDROMSUBCHNL");
WARNING("CDROMSUBCHNL: %s", strerror(errno));
return NG;
}
if (sc.cdsc_audiostatus != CDROM_AUDIO_PLAY) {
+4 -7
View File
@@ -30,9 +30,6 @@
#include "savedata.h"
#include "utfsjis.h"
#define WARN_SAVEERR(cmd, st) \
if (st > 200) fprintf(stderr, "WARNING: Fail to save (cmd=%s, stat=%d)", cmd, st)
void commandQD() {
/* 変数領域などのデータをセーブする。(全セーブ)*/
int num = getCaliValue();
@@ -43,7 +40,7 @@ void commandQD() {
sysVar[0] = save_saveAll(num - 1);
}
WARN_SAVEERR("QD", sysVar[0]);
if (sysVar[0] > 200) WARNING("Failed to save (%d)", sysVar[0]);
DEBUG_COMMAND("QD %d:",num);
}
@@ -61,7 +58,7 @@ void commandQP() {
sysVar[0] = save_savePartial(num - 1, &point, cnt);
}
WARN_SAVEERR("QP", sysVar[0]);
if (sysVar[0] > 200) WARNING("Failed to save (%d)", sysVar[0]);
DEBUG_COMMAND("QP %d,%d,%d:", num, point.var, cnt);
}
@@ -77,7 +74,7 @@ void commandQC() {
sysVar[0] = save_copyAll(num1 - 1, num2 - 1);
}
WARN_SAVEERR("QC", sysVar[0]);
if (sysVar[0] > 200) WARNING("Failed to save (%d)", sysVar[0]);
DEBUG_COMMAND("QC %d,%d:",num1,num2);
}
@@ -108,7 +105,7 @@ void commandQE() {
break;
}
free(fname_utf8);
WARN_SAVEERR("QE", sysVar[0]);
if (sysVar[0] > 200) WARNING("Failed to save (%d)", sysVar[0]);
DEBUG_COMMAND("QE %d,%s,%d,%d:", type, filename, var, cnt);
}
+7 -12
View File
@@ -28,6 +28,7 @@
#include "portab.h"
#include "hankaku.h"
#include "system.h"
static const BYTE hankakutable[3][192] = {{
// 0x8140 - 0x81ff
@@ -137,10 +138,8 @@ static BYTE *zen2han_sjis(const BYTE *src) {
char *dst, *_dst;
dst = _dst = malloc(strlen(src) + 1);
if (dst == NULL) {
fprintf(stderr, "zen2han(): Out of Memory (size %zu)", strlen(src) + 1);
return NULL;
}
if (dst == NULL)
NOMEMERR();
while(0 != (c0 = *src++)) {
if (c0 < 0x81) {
@@ -168,10 +167,8 @@ static BYTE *zen2han_sjis(const BYTE *src) {
static char *zen2han_utf8(const char *src) {
char *dst, *_dst;
dst = _dst = malloc(strlen(src) + 1);
if (dst == NULL) {
fprintf(stderr, "zen2han(): Out of Memory (size %zu)", strlen(src) + 1);
return NULL;
}
if (dst == NULL)
NOMEMERR();
const char *p = src;
while (*p) {
@@ -364,10 +361,8 @@ BYTE *han2zen(const BYTE *src, CharacterEncoding enc) {
BYTE *dst, *_dst;
dst = _dst = malloc(strlen(src) * 2 + 1);
if (dst == NULL) {
fprintf(stderr, "han2zen(): Out of Memory (size %zu)", strlen(src) *2 + 1);
return NULL;
}
if (dst == NULL)
NOMEMERR();
while(0 != (c0 = *src++)) {
if (c0 == 0x20) {
+2 -1
View File
@@ -23,6 +23,7 @@
#include <SDL_mixer.h>
#include "portab.h"
#include "system.h"
#include "midi.h"
// MIX_INIT_FLUIDSYNTH was renamed to MIX_INIT_MID in SDL_mixer 2.0.2
@@ -163,7 +164,7 @@ static int midi_fadestart(int time, int volume, int stop) {
fade_tick = SDL_GetTicks() + time;
return OK;
}
printf("midi_fadestart(%d, %d, %d) unsupported\n", time, volume, stop);
WARNING("(time=%d, volume=%d, stop=%d) unsupported", time, volume, stop);
return NG;
}
+12 -13
View File
@@ -21,8 +21,7 @@
*/
#include "portab.h"
#include <stdio.h>
#include "system.h"
#include "music.h"
#include "music_private.h"
@@ -272,7 +271,7 @@ boolean mus_pcm_get_state() {
int mus_mixer_fadeout_start(int device, int time, int volume, int stop) {
if (device == MIX_MIDI)
return musmidi_fadestart(time, volume, stop);
printf("%s(%d, %d, %d, %d) not implemented\n", __func__, device, time, volume, stop);
WARNING("(device=%d, time=%d, volume=%d, stop=%d) not implemented", device, time, volume, stop);
return NG;
}
@@ -286,7 +285,7 @@ int mus_mixer_fadeout_start(int device, int time, int volume, int stop) {
boolean mus_mixer_fadeout_get_state(int device) {
if (device == MIX_MIDI)
return musmidi_fading();
printf("%s(%d) not implemented\n", __func__, device);
WARNING("(device=%d) not implemented", device);
return FALSE;
}
@@ -295,7 +294,7 @@ boolean mus_mixer_fadeout_get_state(int device) {
* device: 指定デバイス
*/
int mus_mixer_fadeout_stop(int device) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
@@ -306,7 +305,7 @@ int mus_mixer_fadeout_stop(int device) {
* return: ミキサーレベル(0 - 100) (ゲーム内で設定された値)
*/
int mus_mixer_get_level(int device) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return 0;
}
@@ -380,7 +379,7 @@ int mus_wav_fadeout_start(int ch, int time, int volume, int stop) {
if (volume == 0 && stop)
return muspcm_fadeout(ch + 1, time);
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
@@ -389,7 +388,7 @@ int mus_wav_fadeout_start(int ch, int time, int volume, int stop) {
* ch: channel (0-127)
*/
int mus_wav_fadeout_stop(int ch) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
@@ -401,7 +400,7 @@ int mus_wav_fadeout_stop(int ch) {
* FALSE -> フェード中でない
*/
boolean mus_wav_fadeout_get_state(int ch) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return FALSE;
}
@@ -424,7 +423,7 @@ int mus_wav_waitend(int ch) {
* time: 待ち時間(msec)
*/
int mus_wav_waittime(int ch, int time) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
@@ -444,7 +443,7 @@ int mus_wav_wavtime(int ch) {
* num: ファイル番号 (1-65535)
*/
int mus_wav_load_lrsw(int ch, int num) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
@@ -477,11 +476,11 @@ int mus_bgm_wait(int no, int timeout) {
}
int mus_bgm_waitpos(int no, int index) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
int mus_vol_set_valance(int *vols, int num) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
+1 -1
View File
@@ -308,7 +308,7 @@ boolean muspcm_isplaying(int slot) {
// 指定のチャンネルの再生が終了するまで待つ
int muspcm_waitend(int slot) {
printf("%s not implemented\n", __func__);
WARNING("not implemented");
return NG;
}
+6 -6
View File
@@ -22,6 +22,7 @@
*/
/* $Id: profile.c,v 1.6 2001/04/02 21:00:44 chikama Exp $ */
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -36,6 +37,7 @@
#include "portab.h"
#include "profile.h"
#include "system.h"
#define RC_NAME ".xsys35rc"
#define RC_LINE_CHARS_MAX 256
@@ -69,10 +71,8 @@ static boolean insert_profile(const char *name, const char *value)
}
profile = realloc(profile, sizeof(struct profile_kv) * (profile_values + 1));
if (!profile) {
perror("realloc()");
return FALSE;
}
if (!profile)
NOMEMERR();
profile[profile_values].name = strdup(name);
profile[profile_values].value = strdup(value);
@@ -95,7 +95,7 @@ static int load_rc_file(const char *profile_path)
if (feof(fp))
break;
else {
perror("fgets()");
WARNING("%s: %s", profile_path, strerror(errno));
return 1;
}
}
@@ -122,7 +122,7 @@ static int load_rc_file(const char *profile_path)
continue;
if (!(p = strchr(rc_line, ':'))) {
fprintf(stderr, "XSYSTEM35: Syntax Error in '%s' line %d.\n", profile_path, line);
WARNING("Syntax Error in '%s' line %d.", profile_path, line);
return 1;
}
+6 -10
View File
@@ -221,17 +221,16 @@ int save_copyAll(int dstno, int srcno) {
int status, filesize;
if (dstno >= SAVE_MAXNUMBER || srcno >= SAVE_MAXNUMBER) {
// fprintf(stderr, "dstno or srcno is outof range\n");
return SAVE_SAVEERR;
}
saveTop = loadGameData(srcno, &status, &filesize);
if (saveTop == NULL)
return SAVE_SAVEERR;
if (((Ald_baseHdr *)saveTop)->version != SAVE_DATAVERSION) {
fprintf(stderr, "save_copyAll(): endian mismatch\n");
WARNING("endian mismatch");
free(saveTop);
return SAVE_SAVEERR;
}
}
status = saveGameData(dstno, saveTop, filesize);
free(saveTop);
@@ -256,23 +255,20 @@ int save_loadPartial(int no, struct VarRef *vref, int cnt) {
saveTop = loadGameData(no, &status, &filesize);
if (saveTop == NULL) {
// fprintf(stderr, "loadGameData() faild\n");
return status;
}
if (filesize <= sizeof(Ald_baseHdr)) {
// fprintf(stderr, "filesize too short\n");
goto errexit;
}
save_base = (Ald_baseHdr *)saveTop;
if (save_base->version != SAVE_DATAVERSION) {
fprintf(stderr, "save_loadPartial(): endian mismatch\n");
WARNING("endian mismatch");
goto errexit;
}
if (save_base->varSys[vref->page] == 0) {
// fprintf(stderr, "No available Variable\n");
goto errexit;
}
vtop = saveTop + save_base->varSys[vref->page] + sizeof(Ald_sysVarHdr);
@@ -314,9 +310,9 @@ int save_savePartial(int no, struct VarRef *vref, int cnt) {
goto errexit;
save_base = (Ald_baseHdr *)saveTop;
if (save_base->version != SAVE_DATAVERSION) {
fprintf(stderr, "save_savePartial(): endian mismatch\n");
WARNING("endian mismatch");
goto errexit;
}
}
vtop = saveTop + save_base->varSys[vref->page] + sizeof(Ald_sysVarHdr);
tmp = (WORD *)vtop + vref->index;
for (i = 0; i < cnt; i++) {
@@ -352,7 +348,7 @@ int save_loadAll(int no) {
/* 各種データの反映 */
save_base = (Ald_baseHdr *)saveTop;
if (save_base->version != SAVE_DATAVERSION) {
fprintf(stderr, "save_loadAll(): endian mismatch\n");
WARNING("endian mismatch");
goto errexit;
}
if (strcmp(SAVE_DATAID, save_base->ID) != 0)
+1 -2
View File
@@ -520,8 +520,7 @@ void sl_returnGoto(int address) {
} else if (*tmp == STACK_VARIABLE) {
popVars(tmp);
} else {
fprintf(stderr, "%d \n", *tmp);
SYSERROR("Stack buffer is illegal");
SYSERROR("Stack buffer is illegal: %d", *tmp);
}
free(tmp);
tmp = sl_pop();
-7
View File
@@ -172,13 +172,6 @@ static void makeDIB(int width, int height, int depth) {
memset(sdl_dib->format->palette->colors, 0, sizeof(SDL_Color)*256);
}
#if 0
printf("DIB depth %d\n", sdl_dib->format->BitsPerPixel);
printf(" R %04x G %04x B %04x A %04x\n",
sdl_dib->format->Rmask, sdl_dib->format->Gmask,
sdl_dib->format->Bmask, sdl_dib->format->Amask);
#endif
if (sdl_dibinfo) {
free(sdl_dibinfo);
}
+2 -2
View File
@@ -293,10 +293,10 @@ static void init_selwindow() {
drawLineFrame(r.x, r.y, r.w, r.h);
break;
case WINDOW_FRAME_CG:
printf("frameType is CG %d,%d,%d\n",sel.FrameCgNoTop, sel.FrameCgNoMid, sel.FrameCgNoBot);
NOTICE("frameType is CG %d,%d,%d",sel.FrameCgNoTop, sel.FrameCgNoMid, sel.FrameCgNoBot);
break;
default:
printf("frameType is Default");
NOTICE("frameType is Default");
break;
}
ags_setFont(FONT_GOTHIC, sel.MsgFontSize);