Skip to content

Commit d459d4c

Browse files
NexiusTailerNexiusTailer
committed
Fix module compilation warnings
and change amx_Address to amx_GetAddr
1 parent ebe4627 commit d459d4c

9 files changed

Lines changed: 94 additions & 91 deletions

File tree

‎amx-deps/src/CFunctions.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ int CFunctions::amxCall(lua_State *luaVM) {
261261
std::string str = lua_tostring(luaVM, i);
262262
if(str.find(".")!=std::string::npos)
263263
{
264-
float fval = lua_tonumber(luaVM, i);
264+
float fval = (float)lua_tonumber(luaVM, i);
265265
cell val = *(cell*)&fval;
266266
amx_Push(amx, val);
267267
}

‎amx-deps/src/amx/amxargs.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ static cell AMX_NATIVE_CALL n_argindex(AMX *amx, const cell *params)
252252
max = (int)params[3];
253253
if (max <= 0)
254254
return 0;
255-
cptr = amx_Address(amx, params[2]);
255+
amx_GetAddr(amx, params[2], &cptr);
256256

257257
if ((option = tokenize(cmdline, params[1], &length)) == NULL) {
258258
/* option not found, return an empty string */
@@ -290,7 +290,7 @@ static cell AMX_NATIVE_CALL n_argstr(AMX *amx, const cell *params)
290290
if (max <= 0)
291291
return 0;
292292
amx_StrParam(amx, params[2], key);
293-
cptr = amx_Address(amx, params[3]);
293+
amx_GetAddr(amx, params[3], &cptr);
294294

295295
option = matcharg(key, (int)params[1], &length);
296296
if (option == NULL)
@@ -329,7 +329,7 @@ static cell AMX_NATIVE_CALL n_argvalue(AMX *amx, const cell *params)
329329
cell *cptr;
330330

331331
amx_StrParam(amx, params[2], key);
332-
cptr = amx_Address(amx, params[3]);
332+
amx_GetAddr(amx, params[3], &cptr);
333333

334334
option = matcharg(key, (int)params[1], &length);
335335
if (option == NULL)

‎amx-deps/src/amx/amxcons.c‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -749,19 +749,21 @@ static int dochar(AMX *amx,TCHAR ch,const cell* params,int paramidx,TCHAR sign,T
749749
assert(f_putstr!=NULL);
750750
assert(f_putchar!=NULL);
751751
if (width < 0) {
752-
width = *amx_Address(amx, params[paramidx]);
752+
amx_GetAddr(amx,params[paramidx],&cptr);
753+
width=*cptr;
753754
++paramidx;
754755
++ret;
755756
}
756757
if (digits < 0) {
757-
digits = *amx_Address(amx, params[paramidx]);
758+
amx_GetAddr(amx,params[paramidx],&cptr);
759+
digits=*cptr;
758760
++paramidx;
759761
++ret;
760762
}
761763

762764
switch (ch) {
763765
case __T('c'):
764-
cptr=amx_Address(amx, params[paramidx]);
766+
amx_GetAddr(amx,params[paramidx],&cptr);
765767
width--; /* single character itself has a with of 1 */
766768
if (sign!=__T('-'))
767769
while (width-->0)
@@ -775,7 +777,7 @@ static int dochar(AMX *amx,TCHAR ch,const cell* params,int paramidx,TCHAR sign,T
775777
case __T('i'): {
776778
cell value;
777779
int length=1;
778-
cptr=amx_Address(amx, params[paramidx]);
780+
amx_GetAddr(amx,params[paramidx],&cptr);
779781
value=*cptr;
780782
if (value<0 || sign==__T('+'))
781783
length++;
@@ -812,7 +814,7 @@ static int dochar(AMX *amx,TCHAR ch,const cell* params,int paramidx,TCHAR sign,T
812814
if (width>0)
813815
_stprintf(formatstring+_tcslen(formatstring),__T("%d"),width);
814816
_stprintf(formatstring+_tcslen(formatstring),__T(".%df"),digits);
815-
cptr=amx_Address(amx, params[paramidx]);
817+
amx_GetAddr(amx,params[paramidx],&cptr);
816818
#if PAWN_CELL_SIZE == 64
817819
_stprintf(buffer,formatstring,*(double*)cptr);
818820
#else
@@ -833,7 +835,7 @@ static int dochar(AMX *amx,TCHAR ch,const cell* params,int paramidx,TCHAR sign,T
833835
#if !defined FLOATPOINT
834836
case __T('r'): /* if fixed point is enabled, and floating point is not, %r == %q */
835837
#endif
836-
cptr=amx_Address(amx, params[paramidx]);
838+
amx_GetAddr(amx,params[paramidx],&cptr);
837839
/* format the number */
838840
if (digits==INT_MAX)
839841
digits=3;
@@ -860,15 +862,15 @@ static int dochar(AMX *amx,TCHAR ch,const cell* params,int paramidx,TCHAR sign,T
860862
info.f_putstr=f_putstr;
861863
info.f_putchar=f_putchar;
862864
info.user=user;
863-
cptr=amx_Address(amx, params[paramidx]);
865+
amx_GetAddr(amx,params[paramidx],&cptr);
864866
amx_printstring(amx,cptr,&info);
865867
return ret;
866868
} /* case */
867869

868870
case __T('x'): {
869871
ucell value;
870872
int length=1;
871-
cptr=amx_Address(amx, params[paramidx]);
873+
amx_GetAddr(amx,params[paramidx],&cptr);
872874
value=*(ucell*)cptr;
873875
while (value>=0x10) {
874876
length++;
@@ -888,7 +890,7 @@ static int dochar(AMX *amx,TCHAR ch,const cell* params,int paramidx,TCHAR sign,T
888890
case __T('b'): {
889891
ucell value;
890892
int length = 1;
891-
cptr = amx_Address(amx, params[paramidx]);
893+
amx_GetAddr(amx, params[paramidx], &cptr);
892894
value = *(ucell*)cptr;
893895
while (value >= 0x1) {
894896
length++;
@@ -1171,7 +1173,7 @@ static cell AMX_NATIVE_CALL n_print(AMX *amx,const cell *params)
11711173
info.length= ((size_t)params[0]>=3*sizeof(cell)) ? (int)(params[3]-info.skip) : INT_MAX;
11721174

11731175
CreateConsole();
1174-
cstr=amx_Address(amx,params[1]);
1176+
amx_GetAddr(amx,params[1],&cstr);
11751177
amx_printstring(amx,cstr,&info);
11761178
amx_fflush();
11771179
return 0;
@@ -1188,7 +1190,7 @@ static cell AMX_NATIVE_CALL n_print(AMX *amx,const cell *params)
11881190
/* set the new colours */
11891191
oldcolours=amx_setattr((int)params[2],(int)params[3],(int)params[4]);
11901192

1191-
cstr=amx_Address(amx,params[1]);
1193+
amx_GetAddr(amx,params[1],&cstr);
11921194
amx_printstring(amx,cstr,NULL);
11931195
cons_putchar(NULL, __T('\n'));
11941196

@@ -1211,7 +1213,7 @@ static cell AMX_NATIVE_CALL n_printf(AMX *amx,const cell *params)
12111213
info.length=INT_MAX;
12121214

12131215
CreateConsole();
1214-
cstr=amx_Address(amx,params[1]);
1216+
amx_GetAddr(amx,params[1],&cstr);
12151217
amx_printstring(amx,cstr,&info);
12161218
cons_putchar(NULL, __T('\n'));
12171219
amx_fflush();
@@ -1274,7 +1276,7 @@ static cell AMX_NATIVE_CALL n_getstring(AMX *amx,const cell *params)
12741276
assert(chars<max);
12751277
str[chars]='\0';
12761278

1277-
cptr=amx_Address(amx,params[1]);
1279+
amx_GetAddr(amx,params[1],&cptr);
12781280
amx_SetString(cptr,(char*)str,(int)params[3],sizeof(TCHAR)>1,max);
12791281

12801282
} /* if */
@@ -1320,7 +1322,7 @@ static int inlist(AMX *amx,int c,const cell *params,int num)
13201322
key = (int)params[i];
13211323
} else {
13221324
cell *cptr;
1323-
cptr=amx_Address(amx,params[i]);
1325+
amx_GetAddr(amx,params[i],&cptr);
13241326
key=(int)*cptr;
13251327
} /* if */
13261328
if (c==key || c==-key)
@@ -1430,8 +1432,8 @@ static cell AMX_NATIVE_CALL n_wherexy(AMX *amx,const cell *params)
14301432
(void)amx;
14311433
CreateConsole();
14321434
amx_wherexy(&x,&y);
1433-
px=amx_Address(amx,params[1]);
1434-
py=amx_Address(amx,params[2]);
1435+
amx_GetAddr(amx,params[1],&px);
1436+
amx_GetAddr(amx,params[2],&py);
14351437
*px=x;
14361438
*py=y;
14371439
return 0;

‎amx-deps/src/amx/amxcore.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ static cell AMX_NATIVE_CALL funcidx(AMX *amx,const cell *params)
201201
cell *cstr;
202202
int index,err;
203203

204-
cstr=amx_Address(amx,params[1]);
204+
amx_GetAddr(amx,params[1],&cstr);
205205
amx_GetString(name,cstr,0,sizeof name);
206206
err=amx_FindPublic(amx,name,&index);
207207
if (err!=AMX_ERR_NONE)
@@ -341,12 +341,12 @@ static cell AMX_NATIVE_CALL getproperty(AMX *amx,const cell *params)
341341
proplist *item;
342342

343343
(void)amx;
344-
cstr=amx_Address(amx,params[2]);
344+
amx_GetAddr(amx,params[2],&cstr);
345345
name=MakePackedString(cstr);
346346
item=list_finditem(&proproot,params[1],name,params[3],NULL);
347347
/* if list_finditem() found the value, store the name */
348348
if (item!=NULL && item->value==params[3] && strlen(name)==0) {
349-
cstr=amx_Address(amx,params[4]);
349+
amx_GetAddr(amx,params[4],&cstr);
350350
amx_SetString(cstr,item->name,1,0,params[5]);
351351
} /* if */
352352
free(name);
@@ -361,7 +361,7 @@ static cell AMX_NATIVE_CALL setproperty(AMX *amx,const cell *params)
361361
char *name;
362362
proplist *item;
363363

364-
cstr=amx_Address(amx,params[2]);
364+
amx_GetAddr(amx,params[2],&cstr);
365365
name=MakePackedString(cstr);
366366
item=list_finditem(&proproot,params[1],name,params[3],NULL);
367367
if (item==NULL)
@@ -372,7 +372,7 @@ static cell AMX_NATIVE_CALL setproperty(AMX *amx,const cell *params)
372372
prev=item->value;
373373
if (strlen(name)==0) {
374374
free(name);
375-
cstr=amx_Address(amx,params[4]);
375+
amx_GetAddr(amx,params[4],&cstr);
376376
name=MakePackedString(cstr);
377377
} /* if */
378378
list_setitem(item,params[1],name,params[3]);
@@ -390,7 +390,7 @@ static cell AMX_NATIVE_CALL delproperty(AMX *amx,const cell *params)
390390
proplist *item,*pred;
391391

392392
(void)amx;
393-
cstr=amx_Address(amx,params[2]);
393+
amx_GetAddr(amx,params[2],&cstr);
394394
name=MakePackedString(cstr);
395395
item=list_finditem(&proproot,params[1],name,params[3],&pred);
396396
if (item!=NULL) {
@@ -409,7 +409,7 @@ static cell AMX_NATIVE_CALL existproperty(AMX *amx,const cell *params)
409409
proplist *item;
410410

411411
(void)amx;
412-
cstr=amx_Address(amx,params[2]);
412+
amx_GetAddr(amx,params[2],&cstr);
413413
name=MakePackedString(cstr);
414414
item=list_finditem(&proproot,params[1],name,params[3],NULL);
415415
free(name);

‎amx-deps/src/amx/amxfile.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ static cell AMX_NATIVE_CALL n_fopen(AMX *amx, const cell *params)
520520
/* fclose(File: handle) */
521521
static cell AMX_NATIVE_CALL n_fclose(AMX *amx, const cell *params)
522522
{
523-
FILE* f = params[1];
523+
FILE* f = (FILE*)params[1];
524524
if (!f) {
525525
return 0;
526526
}
@@ -531,7 +531,7 @@ static cell AMX_NATIVE_CALL n_fclose(AMX *amx, const cell *params)
531531
/* fwrite(File: handle, const string[]) */
532532
static cell AMX_NATIVE_CALL n_fwrite(AMX *amx, const cell *params)
533533
{
534-
FILE* f = params[1];
534+
FILE* f = (FILE*)params[1];
535535
if (!f) {
536536
return 0;
537537
}
@@ -542,7 +542,7 @@ static cell AMX_NATIVE_CALL n_fwrite(AMX *amx, const cell *params)
542542
int len;
543543

544544
(void)amx;
545-
cptr=amx_Address(amx,params[2]);
545+
amx_GetAddr(amx,params[2],&cptr);
546546
amx_StrLen(cptr,&len);
547547
if (len==0)
548548
return 0;
@@ -563,7 +563,7 @@ static cell AMX_NATIVE_CALL n_fwrite(AMX *amx, const cell *params)
563563
/* fread(File: handle, string[], size=sizeof string, bool:pack=false) */
564564
static cell AMX_NATIVE_CALL n_fread(AMX *amx, const cell *params)
565565
{
566-
FILE* f = params[1];
566+
FILE* f = (FILE*)params[1];
567567
if (!f) {
568568
return 0;
569569
}
@@ -579,7 +579,7 @@ static cell AMX_NATIVE_CALL n_fread(AMX *amx, const cell *params)
579579
if (params[4])
580580
max*=sizeof(cell);
581581

582-
cptr=amx_Address(amx,params[2]);
582+
amx_GetAddr(amx,params[2],&cptr);
583583
str=(char *)alloca(max);
584584
if (str==NULL || cptr==NULL) {
585585
amx_RaiseError(amx, AMX_ERR_NATIVE);
@@ -603,7 +603,7 @@ static cell AMX_NATIVE_CALL n_fread(AMX *amx, const cell *params)
603603
/* fputchar(File: handle, value, bool:utf8 = true) */
604604
static cell AMX_NATIVE_CALL n_fputchar(AMX *amx, const cell *params)
605605
{
606-
FILE* f = params[1];
606+
FILE* f = (FILE*)params[1];
607607
if (!f) {
608608
return 0;
609609
}
@@ -627,7 +627,7 @@ static cell AMX_NATIVE_CALL n_fputchar(AMX *amx, const cell *params)
627627
/* fgetchar(File: handle, bool:utf8 = true) */
628628
static cell AMX_NATIVE_CALL n_fgetchar(AMX *amx, const cell *params)
629629
{
630-
FILE* f = params[1];
630+
FILE* f = (FILE*)params[1];
631631
if (!f) {
632632
return 0;
633633
}
@@ -662,7 +662,7 @@ static cell AMX_NATIVE_CALL n_fgetchar(AMX *amx, const cell *params)
662662
/* fblockwrite(File: handle, buffer[], size=sizeof buffer) */
663663
static cell AMX_NATIVE_CALL n_fblockwrite(AMX *amx, const cell *params)
664664
{
665-
FILE* f = params[1];
665+
FILE* f = (FILE*)params[1];
666666
if (!f) {
667667
return 0;
668668
}
@@ -671,7 +671,7 @@ static cell AMX_NATIVE_CALL n_fblockwrite(AMX *amx, const cell *params)
671671
cell count=0;
672672

673673
(void)amx;
674-
cptr=amx_Address(amx,params[2]);
674+
amx_GetAddr(amx,params[2],&cptr);
675675
if (cptr!=NULL) {
676676
cell max=params[3];
677677
ucell v;
@@ -687,7 +687,7 @@ static cell AMX_NATIVE_CALL n_fblockwrite(AMX *amx, const cell *params)
687687
/* fblockread(File: handle, buffer[], size=sizeof buffer) */
688688
static cell AMX_NATIVE_CALL n_fblockread(AMX *amx, const cell *params)
689689
{
690-
FILE* f = params[1];
690+
FILE* f = (FILE*)params[1];
691691
if (!f) {
692692
return 0;
693693
}
@@ -696,7 +696,7 @@ static cell AMX_NATIVE_CALL n_fblockread(AMX *amx, const cell *params)
696696
cell count=0;
697697

698698
(void)amx;
699-
cptr=amx_Address(amx,params[2]);
699+
amx_GetAddr(amx,params[2],&cptr);
700700
if (cptr!=NULL) {
701701
cell max=params[3];
702702
ucell v;
@@ -720,7 +720,7 @@ static cell AMX_NATIVE_CALL n_ftemp(AMX *amx, const cell *params)
720720
/* fseek(File: handle, position, seek_whence: whence=seek_start) */
721721
static cell AMX_NATIVE_CALL n_fseek(AMX *amx, const cell *params)
722722
{
723-
FILE* f = params[1];
723+
FILE* f = (FILE*)params[1];
724724
if (!f) {
725725
return 0;
726726
}
@@ -812,7 +812,7 @@ static cell AMX_NATIVE_CALL n_frename(AMX *amx, const cell *params)
812812
/* flength(File: handle) */
813813
static cell AMX_NATIVE_CALL n_flength(AMX *amx, const cell *params)
814814
{
815-
FILE* f = params[1];
815+
FILE* f = (FILE*)params[1];
816816
if (!f) {
817817
return 0;
818818
}
@@ -918,7 +918,7 @@ static cell AMX_NATIVE_CALL n_fmatch(AMX *amx, const cell *params)
918918
fullname[0]='\0';
919919
} else {
920920
/* copy the string into the destination */
921-
cptr=amx_Address(amx,params[1]);
921+
amx_GetAddr(amx,params[1],&cptr);
922922
amx_SetString(cptr,fullname,1,0,params[4]);
923923
} /* if */
924924
} /* if */
@@ -944,13 +944,13 @@ static cell AMX_NATIVE_CALL n_fstat(AMX *amx, const cell *params)
944944
err = _tstat(fullname, &stbuf);
945945
#endif
946946
if (err == 0) {
947-
cptr=amx_Address(amx,params[2]);
947+
amx_GetAddr(amx,params[2],&cptr);
948948
*cptr=(cell)stbuf.st_size;
949-
cptr=amx_Address(amx,params[3]);
949+
amx_GetAddr(amx,params[3],&cptr);
950950
*cptr=(cell)stbuf.st_mtime;
951-
cptr=amx_Address(amx,params[4]);
951+
amx_GetAddr(amx,params[4],&cptr);
952952
*cptr=stbuf.st_mode; /* mode/protection bits */
953-
cptr=amx_Address(amx,params[5]);
953+
amx_GetAddr(amx,params[5],&cptr);
954954
*cptr=stbuf.st_ino; /* inode number, unique id for a file */
955955
result=1;
956956
} /* if */
@@ -1134,7 +1134,7 @@ static cell AMX_NATIVE_CALL n_readcfg(AMX *amx, const cell *params)
11341134
amx_StrParam(amx,params[3],key);
11351135
amx_StrParam(amx,params[6],defvalue);
11361136

1137-
cptr=amx_Address(amx,params[4]);
1137+
amx_GetAddr(amx,params[4],&cptr);
11381138
buffer=(char *)alloca(size);
11391139
if (buffer==NULL || cptr==NULL) {
11401140
amx_RaiseError(amx, AMX_ERR_NATIVE);

‎amx-deps/src/amx/amxfloat.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static cell AMX_NATIVE_CALL n_strfloat(AMX *amx,const cell *params)
7474
assert(params[0]/sizeof(cell)==1);
7575

7676
/* Get the real address of the string. */
77-
pString=amx_Address(amx,params[1]);
77+
amx_GetAddr(amx,params[1],&pString);
7878

7979
/* Find out how long the string is in characters. */
8080
amx_StrLen(pString, &nLen);

0 commit comments

Comments
 (0)