mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-23 04:50:28 +02:00
(scm_string_to_char_set, scm_string_to_char_set_x): Use `size_t'
instead of deprecated `scm_sizet'.
This commit is contained in:
parent
fbac920eb0
commit
6cd036ce4f
1 changed files with 9 additions and 9 deletions
|
@ -1,17 +1,17 @@
|
||||||
/* srfi-14.c --- SRFI-14 procedures for Guile
|
/* srfi-14.c --- SRFI-14 procedures for Guile
|
||||||
*
|
*
|
||||||
* Copyright (C) 2001 Free Software Foundation, Inc.
|
* Copyright (C) 2001 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License as
|
* modify it under the terms of the GNU General Public License as
|
||||||
* published by the Free Software Foundation; either version 2, or (at
|
* published by the Free Software Foundation; either version 2, or (at
|
||||||
* your option) any later version.
|
* your option) any later version.
|
||||||
*
|
*
|
||||||
* This program is distributed in the hope that it will be useful, but
|
* This program is distributed in the hope that it will be useful, but
|
||||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
* General Public License for more details.
|
* General Public License for more details.
|
||||||
*
|
*
|
||||||
* You should have received a copy of the GNU General Public License
|
* You should have received a copy of the GNU General Public License
|
||||||
* along with this software; see the file COPYING. If not, write to
|
* along with this software; see the file COPYING. If not, write to
|
||||||
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||||||
|
@ -98,14 +98,14 @@ static SCM
|
||||||
make_char_set (const char * func_name)
|
make_char_set (const char * func_name)
|
||||||
{
|
{
|
||||||
long * p;
|
long * p;
|
||||||
|
|
||||||
p = scm_must_malloc (BYTES_PER_CHARSET, func_name);
|
p = scm_must_malloc (BYTES_PER_CHARSET, func_name);
|
||||||
memset (p, 0, BYTES_PER_CHARSET);
|
memset (p, 0, BYTES_PER_CHARSET);
|
||||||
SCM_RETURN_NEWSMOB (scm_tc16_charset, p);
|
SCM_RETURN_NEWSMOB (scm_tc16_charset, p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SCM_DEFINE (scm_char_set_p, "char-set?", 1, 0, 0,
|
SCM_DEFINE (scm_char_set_p, "char-set?", 1, 0, 0,
|
||||||
(SCM obj),
|
(SCM obj),
|
||||||
"Return @code{#t} if @var{obj} is a character set, @code{#f}\n"
|
"Return @code{#t} if @var{obj} is a character set, @code{#f}\n"
|
||||||
"otherwise.")
|
"otherwise.")
|
||||||
|
@ -167,7 +167,7 @@ SCM_DEFINE (scm_char_set_leq, "char-set<=", 0, 0, 1,
|
||||||
if (prev_data)
|
if (prev_data)
|
||||||
{
|
{
|
||||||
int k;
|
int k;
|
||||||
|
|
||||||
for (k = 0; k < LONGS_PER_CHARSET; k++)
|
for (k = 0; k < LONGS_PER_CHARSET; k++)
|
||||||
{
|
{
|
||||||
if ((prev_data[k] & csi_data[k]) != prev_data[k])
|
if ((prev_data[k] & csi_data[k]) != prev_data[k])
|
||||||
|
@ -196,7 +196,7 @@ SCM_DEFINE (scm_char_set_hash, "char-set-hash", 1, 1, 0,
|
||||||
int k;
|
int k;
|
||||||
|
|
||||||
SCM_VALIDATE_SMOB (1, cs, charset);
|
SCM_VALIDATE_SMOB (1, cs, charset);
|
||||||
|
|
||||||
if (SCM_UNBNDP (bound))
|
if (SCM_UNBNDP (bound))
|
||||||
bnd = default_bnd;
|
bnd = default_bnd;
|
||||||
else
|
else
|
||||||
|
@ -558,7 +558,7 @@ SCM_DEFINE (scm_string_to_char_set, "string->char-set", 1, 1, 0,
|
||||||
SCM cs;
|
SCM cs;
|
||||||
long * p;
|
long * p;
|
||||||
char * s;
|
char * s;
|
||||||
scm_sizet k = 0;
|
size_t k = 0;
|
||||||
|
|
||||||
SCM_VALIDATE_STRING (1, str);
|
SCM_VALIDATE_STRING (1, str);
|
||||||
if (SCM_UNBNDP (base_cs))
|
if (SCM_UNBNDP (base_cs))
|
||||||
|
@ -589,7 +589,7 @@ SCM_DEFINE (scm_string_to_char_set_x, "string->char-set!", 2, 0, 0,
|
||||||
{
|
{
|
||||||
long * p;
|
long * p;
|
||||||
char * s;
|
char * s;
|
||||||
scm_sizet k = 0;
|
size_t k = 0;
|
||||||
|
|
||||||
SCM_VALIDATE_STRING (1, str);
|
SCM_VALIDATE_STRING (1, str);
|
||||||
SCM_VALIDATE_SMOB (2, base_cs, charset);
|
SCM_VALIDATE_SMOB (2, base_cs, charset);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue