mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-10 14:00:21 +02:00
Code Activity

* alist.c, chars.c, dynl.c, net_db.c, numbers.c, unif.c: Use

Browse source 
SCM_NUM2ULONG instead of scm_num2ulong; SCM_NUM2LONG instead of
scm_num2long; SCM_WTA instead of scm_wta.  Only done for when
FUNC_NAME was used as an argument of the macro and the formal
argument name was the explicit argument in the old function call.
These were just missed in my first pass of changes.
This commit is contained in:
Greg J. Badros 1999-12-18 23:24:35 +00:00
parent f334710588
commit 4638e08794
6 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/alist.c
View file

@ -172,7 +172,7 @@ GUILE_PROC(scm_assv, "assv", 2, 0, 0,
}
# ifndef SCM_RECKLESS
if (!(SCM_NULLP(alist)))
badlst: scm_wta(alist, (char *)SCM_ARG2, FUNC_NAME);
badlst: SCM_WTA(2,alist);
# endif
return SCM_BOOL_F;
}

2
libguile/chars.c
View file

@ -265,7 +265,7 @@ GUILE_PROC(scm_integer_to_char, "integer->char", 1, 0, 0,
"Return the character at position N in the Ascii sequence.")
#define FUNC_NAME s_scm_integer_to_char
{
unsigned long ni = 0xffff & scm_num2ulong (n, (char *)SCM_ARG1, FUNC_NAME);
unsigned long ni = 0xffff & SCM_NUM2ULONG (1,n);
return SCM_MAKICHR(ni);
}
#undef FUNC_NAME

5
libguile/dynl.c
View file

@ -476,7 +476,7 @@ Interrupts are deferred while the C function is executing (with
if (SCM_ROSTRINGP (func))
func = scm_dynamic_func (func, dobj);
fptr = (void (*)()) scm_num2ulong (func, (char *)SCM_ARG1, FUNC_NAME);
fptr = (void (*)()) SCM_NUM2ULONG (1, func);
SCM_DEFER_INTS;
fptr ();
SCM_ALLOW_INTS;
@ -520,8 +520,7 @@ and returned from the call to @code{dynamic-args-call}.
if (SCM_ROSTRINGP (func))
func = scm_dynamic_func (func, dobj);
fptr = (int (*)(int, char **)) scm_num2ulong (func, (char *)SCM_ARG1,
FUNC_NAME);
fptr = (int (*)(int, char **)) SCM_NUM2ULONG (1,func);
SCM_DEFER_INTS;
argv = scm_make_argv_from_stringlist (args, &argc, FUNC_NAME,
SCM_ARG3);

4
libguile/net_db.c
View file

@ -281,7 +281,7 @@ Unusual conditions may result in errors thrown to the
}
else
{
inad.s_addr = htonl (scm_num2ulong (name, (char *) SCM_ARG1, FUNC_NAME));
inad.s_addr = htonl (SCM_NUM2ULONG (1,name);
entry = gethostbyaddr ((char *) &inad, sizeof (inad), AF_INET);
}
if (!entry)
@ -356,7 +356,7 @@ given.")
else
{
unsigned long netnum;
netnum = scm_num2ulong (name, (char *) SCM_ARG1, FUNC_NAME);
netnum = SCM_NUM2ULONG (1, name);
entry = getnetbyaddr (netnum, AF_INET);
}
if (!entry)

4
libguile/numbers.c
View file

@ -1875,7 +1875,7 @@ GUILE_PROC (scm_number_to_string, "number->string", 1, 1, 0,
if (!SCM_INEXP (x))
{
badx:
scm_wta (x, (char *) SCM_ARG1, FUNC_NAME);
SCM_WTA (1, x);
}
#endif
#else
@ -4436,7 +4436,7 @@ GUILE_PROC (scm_inexact_to_exact, "inexact->exact", 1, 0, 0,
if (!(SCM_REALP (z)))
{
badz:
scm_wta (z, (char *) SCM_ARG1, FUNC_NAME);
SCM_WTA (1, z);
}
#endif
#else

10
libguile/unif.c
View file

@ -1536,7 +1536,7 @@ loop:
if (!SCM_UNBNDP (start))
{
offset =
scm_num2long (start, (char *) SCM_ARG3, FUNC_NAME);
SCM_NUM2LONG (3, start);
if (offset < 0 || offset >= cend)
scm_out_of_range (FUNC_NAME, start);
@ -1544,7 +1544,7 @@ loop:
if (!SCM_UNBNDP (end))
{
long tend =
scm_num2long (end, (char *) SCM_ARG4, FUNC_NAME);
SCM_NUM2LONG (4, end);
if (tend <= offset || tend > cend)
scm_out_of_range (FUNC_NAME, end);
@ -1647,7 +1647,7 @@ loop:
switch SCM_TYP7 (v)
{
default:
badarg1:scm_wta (v, (char *) SCM_ARG1, FUNC_NAME);
badarg1:SCM_WTA (1, v);
case scm_tc7_smob:
SCM_ASRTGO (SCM_ARRAYP (v), badarg1);
v = scm_ra2contig (v, 1);
@ -1694,7 +1694,7 @@ loop:
if (!SCM_UNBNDP (start))
{
offset =
scm_num2long (start, (char *) SCM_ARG3, FUNC_NAME);
SCM_NUM2LONG (3, start);
if (offset < 0 || offset >= cend)
scm_out_of_range (FUNC_NAME, start);
@ -1702,7 +1702,7 @@ loop:
if (!SCM_UNBNDP (end))
{
long tend =
scm_num2long (end, (char *) SCM_ARG4, FUNC_NAME);
SCM_NUM2LONG (4, end);
if (tend <= offset || tend > cend)
scm_out_of_range (FUNC_NAME, end);