aboutsummaryrefslogtreecommitdiff
path: root/project/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--project/src/lib-checksum.c2
-rw-r--r--project/src/lib-ctcode.c2
-rw-r--r--project/src/lib-image1.c4
-rw-r--r--project/src/lib-image2.c3
-rw-r--r--project/src/lib-kcl.c8
-rw-r--r--project/src/lib-kcl.h2
-rw-r--r--project/src/lib-kmp-pflags.c2
-rw-r--r--project/src/lib-kmp-text.c8
-rw-r--r--project/src/lib-kmp.c6
-rw-r--r--project/src/lib-mdl.c2
-rw-r--r--project/src/lib-numeric.c4
-rw-r--r--project/src/lib-numeric.h2
-rw-r--r--project/src/lib-parser-func.c4
-rw-r--r--project/src/lib-parser.c9
-rw-r--r--project/src/lib-pat.c2
-rw-r--r--project/src/lib-rkg.c2
-rw-r--r--project/src/lib-std.c6
-rw-r--r--project/src/lib-std.h3
-rw-r--r--project/src/lib-szs-create.c6
-rw-r--r--project/src/wkclt.c20
-rw-r--r--project/src/wstrt.c4
-rw-r--r--project/src/wszst.c15
-rw-r--r--project/src/wtest.c2
23 files changed, 57 insertions, 61 deletions
diff --git a/project/src/lib-checksum.c b/project/src/lib-checksum.c
index 990fa7f..4057e31 100644
--- a/project/src/lib-checksum.c
+++ b/project/src/lib-checksum.c
@@ -715,7 +715,7 @@ void ScanSZSCache ( ccp dir_name, bool purge )
if (!dent)
break;
- if ( dent->d_name && *dent->d_name != '.' )
+ if ( *dent->d_name != '.' )
{
noPRINT("> %s\n",dent->d_name);
StoreSZSCache(dent->d_name,0,purge,0);
diff --git a/project/src/lib-ctcode.c b/project/src/lib-ctcode.c
index 11b60e4..6aa43ce 100644
--- a/project/src/lib-ctcode.c
+++ b/project/src/lib-ctcode.c
@@ -2807,7 +2807,7 @@ enumError LoadCTCODE
//--- load and scan data
raw_data_t raw;
- enumError err = LoadRawData(&raw,true,fname,0,ignore_no_file,false);
+ enumError err = LoadRawData(&raw,true,fname,0,ignore_no_file,0);
if (!err)
{
ctcode->fname = raw.fname;
diff --git a/project/src/lib-image1.c b/project/src/lib-image1.c
index bf7673f..f99154a 100644
--- a/project/src/lib-image1.c
+++ b/project/src/lib-image1.c
@@ -561,7 +561,7 @@ bool IsGrayIMG
{
DASSERT(img);
image_format_t xform;
- NormalizeIF(&xform,img->iform,IMG_X_RGB,img->iform);
+ NormalizeIF(&xform,img->iform,IMG_X_RGB,img->pform);
return xform == IMG_X_GRAY;
}
@@ -894,7 +894,7 @@ static enumError TransformPalette
FREE(itab);
return ERROR0(ERR_INVALID_IFORM,
"Palette format 0x%02x [%s] not supported: %s\n",
- src_img->pform, GetImageFormatName(src_img->pform,"?"), src_img->path );
+ src_img->pform, GetPaletteFormatName(src_img->pform,"?"), src_img->path );
}
diff --git a/project/src/lib-image2.c b/project/src/lib-image2.c
index 614838d..1f861b5 100644
--- a/project/src/lib-image2.c
+++ b/project/src/lib-image2.c
@@ -80,7 +80,8 @@ enumError AssignIMG
// [[analyse-magic]]
const file_format_t fform = GetByMagicFF(data,data_size,data_size);
- image_format_t iform = IMG_INVALID, pform = PAL_INVALID;
+ image_format_t iform = IMG_INVALID;
+ palette_format_t pform = PAL_INVALID;
uint width = 0, height = 0, n_pal = 0, psize = 0, n_img = 0;
const u8 *idata = 0, *pdata = 0;
bool calc_geo = false; // true: calculate geometry for mipmaps
diff --git a/project/src/lib-kcl.c b/project/src/lib-kcl.c
index 090abc5..629ced6 100644
--- a/project/src/lib-kcl.c
+++ b/project/src/lib-kcl.c
@@ -4113,7 +4113,7 @@ enumError ScanRawDataKCL
bool init_kcl, // true: initialize 'kcl' first
struct raw_data_t * raw, // valid raw data
bool move_data, // true: move 'raw.data' to 'kcl'
- CheckMode_t mode // not NULL: call CheckKCL(mode)
+ CheckMode_t check_mode // not NULL: call CheckKCL(check_mode)
)
{
DASSERT(kcl);
@@ -4133,7 +4133,7 @@ enumError ScanRawDataKCL
return ERR_OK;
}
- enumError err = ScanKCL(kcl,false,raw->data,raw->data_size,mode,move_data);
+ enumError err = ScanKCL(kcl,false,raw->data,raw->data_size,move_data,check_mode);
if ( kcl->raw_data == raw->data )
{
@@ -4173,7 +4173,7 @@ enumError LoadKCL
{
kcl->fname = raw.fname;
raw.fname = 0;
- err = ScanKCL(kcl,false,raw.data,raw.data_size,mode,true);
+ err = ScanKCL(kcl,false,raw.data,raw.data_size,true,mode);
if ( kcl->raw_data == raw.data )
{
// move the data
@@ -4288,7 +4288,7 @@ kcl_t * LoadReferenceKCL()
kcl_t kcl;
InitializeKCL(&kcl);
//kcl.fform_outfile = FF_KCL;
- err = ScanRawDataKCL(&kcl,false,&raw,0,false);
+ err = ScanRawDataKCL(&kcl,false,&raw,false,0);
ResetRawData(&raw);
if (err)
{
diff --git a/project/src/lib-kcl.h b/project/src/lib-kcl.h
index 9a73043..863e9e9 100644
--- a/project/src/lib-kcl.h
+++ b/project/src/lib-kcl.h
@@ -924,7 +924,7 @@ enumError ScanRawDataKCL
bool init_kcl, // true: initialize 'kcl' first
struct raw_data_t * raw, // valid raw data
bool move_data, // true: move 'raw.data' to 'kcl'
- CheckMode_t mode // not NULL: call CheckKCL(mode)
+ CheckMode_t check_mode // not NULL: call CheckKCL(check_mode)
);
//-----------------------------------------------------------------------------
diff --git a/project/src/lib-kmp-pflags.c b/project/src/lib-kmp-pflags.c
index 07be6c6..bfe77e2 100644
--- a/project/src/lib-kmp-pflags.c
+++ b/project/src/lib-kmp-pflags.c
@@ -1643,7 +1643,7 @@ xpf_mode1_t CheckMode1GOBJ ( const kmp_gobj_entry_t *g )
typedef struct xpf_mode1_elem_t
{
- int index; // index of element wihiin list
+ int index; // index of element within list
xpf_mode1_t mode; // mode
kmp_gobj_entry_t *obj; // pointer to object
kmp_gobj_entry_t norm; // copy of 'obj' with normalized data
diff --git a/project/src/lib-kmp-text.c b/project/src/lib-kmp-text.c
index c30c57b..0f3e292 100644
--- a/project/src/lib-kmp-text.c
+++ b/project/src/lib-kmp-text.c
@@ -6779,9 +6779,7 @@ enumError SaveTextKMP
fwrite(text_kmp_gobj_tabhead_cr,1,sizeof(text_kmp_gobj_tabhead_cr)-1,F.f);
- u8 done[N_KMP_GOBJ];
- memset(done,0,sizeof(done));
-
+ u8 done[N_KMP_GOBJ] = {0};
const kmp_gobj_entry_t * gobj = (kmp_gobj_entry_t*)kmp->dlist[KMP_GOBJ].list;
for ( i = 0; i < n; i++, gobj++ )
{
@@ -6896,7 +6894,7 @@ enumError SaveTextKMP
GetConditionRefInfo(&cri,gobj->ref_id,gobj->obj_id,true);
fprintf(F.f," $%s %s%s%s\r\n",
cri.cmd_suffix, cri.cond,
- cri.info ? " # " : "", cri.info ? cri.info : "" );
+ cri.info[0] ? " # " : "", cri.info );
}
fprintf(F.f,"#%.84s\r\n",Minus300);
@@ -6985,7 +6983,7 @@ enumError SaveTextKMP
if (cri.is_condref)
fprintf(F.f," $%s %s%s%s\r\n",
cri.cmd_suffix, cri.cond,
- cri.info ? " # " : "", cri.info ? cri.info : "" );
+ cri.info[0] ? " # " : "", cri.info );
PRINT0("# CR[%#x,%#x]: is=%d, found=%d, cmd=%s, xor:%x->%#x, c=%s, i=%s\n",
gobj->ref_id, gobj->obj_id,
cri.is_condref, cri.condref!=0, cri.cmd_suffix,
diff --git a/project/src/lib-kmp.c b/project/src/lib-kmp.c
index 1fb957d..239e577 100644
--- a/project/src/lib-kmp.c
+++ b/project/src/lib-kmp.c
@@ -6560,7 +6560,7 @@ static void check_ph
if ( end > n_pt )
end = n_pt;
- u8 done[0xff];
+ u8 done[0x100];
memset(done,0,sizeof(done));
uint j;
@@ -6673,9 +6673,7 @@ int CheckKMP
memset(route_usage,0,sizeof(route_usage));
enum { RU_CAME = 1, RU_GOBJ = 2 };
- u16 jgpt_usage[0x100];
- memset(jgpt_usage,0,sizeof(jgpt_usage));
-
+ u16 jgpt_usage[0x100] = {0};
const int ncame = kmp->dlist[KMP_CAME].used;
const int npoti = kmp->dlist[KMP_POTI].used;
const int njgpt = kmp->dlist[KMP_JGPT].used;
diff --git a/project/src/lib-mdl.c b/project/src/lib-mdl.c
index 5e623bf..20319f6 100644
--- a/project/src/lib-mdl.c
+++ b/project/src/lib-mdl.c
@@ -1745,7 +1745,7 @@ enumError LoadMDL
//--- load and scan data
raw_data_t raw;
- enumError err = LoadRawData(&raw,true,fname,0,ignore_no_file,false);
+ enumError err = LoadRawData(&raw,true,fname,0,ignore_no_file,0);
if (!err)
{
mdl->fname = raw.fname;
diff --git a/project/src/lib-numeric.c b/project/src/lib-numeric.c
index bfe5ecb..08c88af 100644
--- a/project/src/lib-numeric.c
+++ b/project/src/lib-numeric.c
@@ -718,12 +718,12 @@ double AngleVector
const double ax = point[0] - prev[0];
const double az = point[2] - prev[2];
- if ( abs(ax) + abs(az) < 1e-6 )
+ if ( fabs(ax) + fabs(az) < 1e-6 )
return 0.0;
const double bx = next[0] - point[0];
const double bz = next[2] - point[2];
- if ( abs(bx) + abs(bz) < 1e-6 )
+ if ( fabs(bx) + fabs(bz) < 1e-6 )
return 0.0;
if (!return_degree)
diff --git a/project/src/lib-numeric.h b/project/src/lib-numeric.h
index 7fc84df..5414c7f 100644
--- a/project/src/lib-numeric.h
+++ b/project/src/lib-numeric.h
@@ -2167,7 +2167,7 @@ TextCommand_t GetTextCommand
//-----------------------------------------------------------------------------
-enumError ScanTextCommand
+TextCommand_t ScanTextCommand
(
ScanInfo_t * si // valid data
);
diff --git a/project/src/lib-parser-func.c b/project/src/lib-parser-func.c
index 5747f25..55e7c61 100644
--- a/project/src/lib-parser-func.c
+++ b/project/src/lib-parser-func.c
@@ -3204,7 +3204,7 @@ static enumError F_abs
break;
case VAR_INT:
- res->i = abs(param->i);
+ res->i = llabs(param->i);
break;
case VAR_DOUBLE:
@@ -3792,7 +3792,7 @@ static enumError F_sqrt
break;
case VAR_INT:
- res->d = sqrt(abs(param->i));
+ res->d = sqrt(llabs(param->i));
res->mode = VAR_DOUBLE;
break;
diff --git a/project/src/lib-parser.c b/project/src/lib-parser.c
index 094a1ee..6437b2c 100644
--- a/project/src/lib-parser.c
+++ b/project/src/lib-parser.c
@@ -5366,7 +5366,7 @@ TextCommand_t GetTextCommand
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-enumError ScanTextCommand
+TextCommand_t ScanTextCommand
(
ScanInfo_t * si // valid data
)
@@ -6524,11 +6524,12 @@ void CalcExpr
if ( src2->i >= 0 )
{
// try integer calculation first, double is fall back on overflow
- int n = src2->i, res = 1, err = 0;
+ s64 res = 1;
+ int n = src2->i, err = 0;
while ( n-- > 0 )
{
- int new_res = res * dest->i;
- if ( abs(new_res) <= abs(res) )
+ s64 new_res = res * dest->i;
+ if ( llabs(new_res) <= llabs(res) )
{
err++;
break;
diff --git a/project/src/lib-pat.c b/project/src/lib-pat.c
index 131d0bc..62ff78b 100644
--- a/project/src/lib-pat.c
+++ b/project/src/lib-pat.c
@@ -1703,7 +1703,7 @@ enumError LoadPAT
//--- load and scan data
raw_data_t raw;
- enumError err = LoadRawData(&raw,true,fname,0,ignore_no_file,false);
+ enumError err = LoadRawData(&raw,true,fname,0,ignore_no_file,0);
if (!err)
{
pat->fname = raw.fname;
diff --git a/project/src/lib-rkg.c b/project/src/lib-rkg.c
index 9d39c74..a120228 100644
--- a/project/src/lib-rkg.c
+++ b/project/src/lib-rkg.c
@@ -123,7 +123,7 @@ enumError ScanRawDataGHOST
{
FREE(dest);
ri->error = "decompression failed";
- return false;
+ return ERR_WARNING;
}
data = dest;
diff --git a/project/src/lib-std.c b/project/src/lib-std.c
index fd1d201..3a845a0 100644
--- a/project/src/lib-std.c
+++ b/project/src/lib-std.c
@@ -5493,13 +5493,13 @@ palette_format_t ScanPaletteFormat ( ccp arg )
///////////////////////////////////////////////////////////////////////////////
-ccp GetPaletteFormatName ( image_format_t iform, ccp unknown_value )
+ccp GetPaletteFormatName ( palette_format_t pform, ccp unknown_value )
{
- if ( iform >= 0 )
+ if ( pform >= 0 )
{
const KeywordTab_t * ct;
for ( ct = cmdtab_palette_format; ct->name1; ct++ )
- if ( ct->id == iform )
+ if ( ct->id == pform )
return ct->name1;
}
return unknown_value;
diff --git a/project/src/lib-std.h b/project/src/lib-std.h
index 615a038..b97fcc9 100644
--- a/project/src/lib-std.h
+++ b/project/src/lib-std.h
@@ -1076,7 +1076,7 @@ typedef enum palette_format_t
extern const KeywordTab_t cmdtab_palette_format[];
int ScanPaletteFormat ( ccp arg );
-ccp GetPaletteFormatName ( image_format_t iform, ccp unknown_value );
+ccp GetPaletteFormatName ( palette_format_t pform, ccp unknown_value );
//
///////////////////////////////////////////////////////////////////////////////
@@ -1296,6 +1296,7 @@ slot_info_t GetSlotByName ( mem_t name, bool minus_for_empty );
///////////////////////////////////////////////////////////////////////////////
/////////////// struct FormatField_t ///////////////
///////////////////////////////////////////////////////////////////////////////
+// [[FormatFieldItem_t]]
typedef struct FormatFieldItem_t
{
diff --git a/project/src/lib-szs-create.c b/project/src/lib-szs-create.c
index bcddfd4..36d8516 100644
--- a/project/src/lib-szs-create.c
+++ b/project/src/lib-szs-create.c
@@ -99,7 +99,7 @@ static const alter_file_t * ShallRemoveFile ( ccp fname )
if ( opt_slot & alter->rm_mode && !strcasecmp(fname,alter->fname) )
return alter;
}
- return false;
+ return 0;
}
///////////////////////////////////////////////////////////////////////////////
@@ -594,7 +594,7 @@ enumError CreateSZS
InitializeKCL(&kcl);
kcl.fform_outfile = FF_KCL;
kcl.fname = STRDUP(sd.path);
- enumError err = ScanKCL(&kcl,false,data,st.st_size,global_check_mode,true);
+ enumError err = ScanKCL(&kcl,false,data,st.st_size,true,global_check_mode);
if (err)
{
if ( err > ERR_WARNING )
@@ -3138,7 +3138,7 @@ int CheckSZS
{
kcl.fname = STRDUP2(szs->fname,"/course.kcl");
kcl_valid = !ScanKCL( &kcl, false, szs->course_kcl_data,
- szs->course_kcl_size, true, sub_mode);
+ szs->course_kcl_size, true, sub_mode );
if (kcl_valid)
{
diff --git a/project/src/wkclt.c b/project/src/wkclt.c
index 891f7e1..bd2b7fe 100644
--- a/project/src/wkclt.c
+++ b/project/src/wkclt.c
@@ -294,7 +294,7 @@ static enumError cmd_cat()
}
kcl_t kcl;
- err = ScanRawDataKCL(&kcl,true,&raw,mode,true);
+ err = ScanRawDataKCL(&kcl,true,&raw,true,mode);
if ( err > ERR_WARNING )
return err;
@@ -355,7 +355,7 @@ static enumError cmd_convert ( int cmd_id, ccp cmd_name, ccp def_path )
kcl_t kcl;
InitializeKCL(&kcl);
kcl.fform_outfile = dest_ff;
- err = ScanRawDataKCL(&kcl,false,&raw,global_check_mode,true);
+ err = ScanRawDataKCL(&kcl,false,&raw,true,global_check_mode);
if ( err > ERR_WARNING )
return err;
@@ -436,7 +436,7 @@ static enumError cmd_copy()
kcl_t kcl;
InitializeKCL(&kcl);
kcl.fform_outfile = dest_ff;
- err = ScanRawDataKCL(&kcl,false,&raw,global_check_mode,true);
+ err = ScanRawDataKCL(&kcl,false,&raw,true,global_check_mode);
if ( err > ERR_WARNING )
return err;
@@ -540,7 +540,7 @@ static enumError cmd_cff()
return err;
kcl_t kcl;
- err = ScanRawDataKCL(&kcl,true,&raw,global_check_mode,true);
+ err = ScanRawDataKCL(&kcl,true,&raw,true,global_check_mode);
if ( err > ERR_WARNING )
return err;
@@ -704,7 +704,7 @@ static enumError cmd_flags()
GetNameFF(raw.fform,0), raw.fname );
kcl_t kcl;
- err = ScanRawDataKCL(&kcl,true,&raw,global_check_mode,true);
+ err = ScanRawDataKCL(&kcl,true,&raw,true,global_check_mode);
if ( err > ERR_WARNING )
return err;
@@ -800,7 +800,7 @@ static enumError cmd_dump ( bool brief_level, int cmd )
kcl_t kcl;
InitializeKCL(&kcl);
kcl.fform_outfile = FF_KCL;
- err = ScanRawDataKCL(&kcl,false,&raw,global_check_mode,true);
+ err = ScanRawDataKCL(&kcl,false,&raw,true,global_check_mode);
if ( err > ERR_WARNING )
return err;
@@ -870,7 +870,7 @@ static enumError cmd_traverse ( bool fall )
}
kcl_t kcl;
- err = ScanRawDataKCL(&kcl,true,&raw,0,true);
+ err = ScanRawDataKCL(&kcl,true,&raw,true,0);
if ( err > ERR_WARNING || !param )
return err;
@@ -952,7 +952,7 @@ static enumError cmd_check()
}
kcl_t kcl;
- err = ScanRawDataKCL(&kcl,true,&raw,0,true);
+ err = ScanRawDataKCL(&kcl,true,&raw,true,0);
if ( err <= ERR_WARNING && ( !mode || CheckKCL(&kcl,mode) ))
cmd_err = ERR_DIFFER;
fflush(stdout);
@@ -1064,7 +1064,7 @@ static enumError cmd_analyze()
GetNameFF(raw.fform,0), raw.fname );
kcl_t kcl;
- err = ScanRawDataKCL(&kcl,true,&raw,0,true);
+ err = ScanRawDataKCL(&kcl,true,&raw,true,0);
if ( err > ERR_WARNING )
return err;
@@ -1097,7 +1097,7 @@ static enumError cmd_blow()
return err;
kcl_t kcl;
- err = ScanRawDataKCL(&kcl,true,&raw,0,true);
+ err = ScanRawDataKCL(&kcl,true,&raw,true,0);
if ( err > ERR_WARNING )
return err;
diff --git a/project/src/wstrt.c b/project/src/wstrt.c
index 9ae3e33..6901ec3 100644
--- a/project/src/wstrt.c
+++ b/project/src/wstrt.c
@@ -530,7 +530,6 @@ static enumError cmd_https()
ptr++;
continue;
}
-//printf(">H> %06x : %s\n",(int)(ptr-str.data),ptr);
sl = ServerList;
ptr += off;
if (*ptr)
@@ -557,7 +556,6 @@ static enumError cmd_https()
ptr++;
continue;
}
-//printf(">G> %06x : %s\n",(int)(ptr-str.data),ptr);
is_http = 0;
off = 19;
@@ -571,7 +569,7 @@ static enumError cmd_https()
str_server_patch_t *pat = patch_list + n_list++;
pat->mode = str.mode;
- pat->flags = str.is_dol;
+ pat->flags = str.is_dol ? STR_F_IS_DOL : 0;
pat->is_http = is_http;
pat->serv_type = sl->serv_type;
pat->offset = ptr - off - str.data;
diff --git a/project/src/wszst.c b/project/src/wszst.c
index b7892bc..895357f 100644
--- a/project/src/wszst.c
+++ b/project/src/wszst.c
@@ -2636,7 +2636,7 @@ static enumError cmd_distribution()
if (!dent)
break;
- if ( dent->d_name && *dent->d_name != '.' )
+ if ( *dent->d_name != '.' )
{
PathCatPP(path,sizeof(path),param->arg,dent->d_name);
#if HAVE_WIIMM_EXT // [[2do]] by option
@@ -2988,12 +2988,11 @@ static enumError cmd_slots()
if ( KCL_MODE & KCLMD_DROP_AUTO )
SetKclMode(KCL_MODE|KCLMD_DROP_UNUSED);
- const bool have_col = IsFileColorized(stdout);
- ccp col_minus = GetTextMode(have_col,TTM_BOLD|TTM_RED);
- ccp col_plus = GetTextMode(have_col,TTM_BOLD|TTM_GREEN);
- ccp col_misc = GetTextMode(have_col,TTM_BOLD|TTM_CYAN);
- ccp col_reset = GetTextMode(have_col,TTM_RESET);
- MARK_USED(col_minus,col_plus,col_misc);
+ const ColorMode_t colmode = GetFileColorized(stdout);
+ ccp col_minus = GetTextMode(colmode,TTM_BOLD|TTM_RED);
+ ccp col_plus = GetTextMode(colmode,TTM_BOLD|TTM_GREEN);
+ ccp col_misc = GetTextMode(colmode,TTM_BOLD|TTM_CYAN);
+ ccp col_reset = GetTextMode(colmode,TTM_RESET);
enumError max_err = ERR_OK;
ParamList_t *param;
@@ -4571,7 +4570,7 @@ static bool ConvertHelper
kcl_t kcl;
InitializeKCL(&kcl);
kcl.fname = src_fname;
- *err = ScanKCL(&kcl,false,data,data_size,global_check_mode,true);
+ *err = ScanKCL(&kcl,false,data,data_size,true,global_check_mode);
if (*err)
return false;
*err = testmode
diff --git a/project/src/wtest.c b/project/src/wtest.c
index 38e2960..f91feb2 100644
--- a/project/src/wtest.c
+++ b/project/src/wtest.c
@@ -1949,7 +1949,7 @@ static enumError test_find_dol ( int argc, char ** argv )
}
dol_header_t dh;
- enumError err = LoadFILE(argv[1],0,0,&dh,sizeof(dh),1,false,false);
+ enumError err = LoadFILE(argv[1],0,0,&dh,sizeof(dh),1,0,false);
if (err)
return err;
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-29 15:26:51 +0000