1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-06 15:40:29 +02:00

* strports.c (st_end_input): Inserted parenthesis to get operator

grouping correct.

* fports.c, list.c, numbers.c, ports.c, stime.c, symbols.c,
filesys.c, posix.c: Converted docstrings to ANSI C format and
escaped " occurring inside string literals.
This commit is contained in:
Mikael Djurfeldt 2000-01-18 14:13:31 +00:00
parent d9b6c17032
commit a3c8b9fce9
7 changed files with 64 additions and 69 deletions

View file

@ -1033,9 +1033,9 @@ SCM_DEFINE (scm_fcntl, "fcntl", 2, 0, 1,
"@item F_SETOWN\n" "@item F_SETOWN\n"
"Set the process that owns a socket to @var{value}, for @code{SIGIO} signals.\n" "Set the process that owns a socket to @var{value}, for @code{SIGIO} signals.\n"
"@item FD_CLOEXEC\n" "@item FD_CLOEXEC\n"
"The value used to indicate the "close on exec" flag with @code{F_GETFL} or "The value used to indicate the \"close on exec\" flag with @code{F_GETFL} or"
@code{F_SETFL}. "@code{F_SETFL}."
@end table") "@end table")
#define FUNC_NAME s_scm_fcntl #define FUNC_NAME s_scm_fcntl
{ {
int rv; int rv;

View file

@ -687,10 +687,10 @@ SCM_DEFINE (scm_ash, "ash", 2, 0, 0,
"Example:\n" "Example:\n"
"@lisp\n" "@lisp\n"
"(number->string (ash #b1 3) 2)\n" "(number->string (ash #b1 3) 2)\n"
" @result{} "1000" " @result{} \"1000\""
(number->string (ash #b1010 -1) 2) "(number->string (ash #b1010 -1) 2)"
@result{} "101" " @result{} \"101\""
@end lisp") "@end lisp")
#define FUNC_NAME s_scm_ash #define FUNC_NAME s_scm_ash
{ {
/* GJB:FIXME:: what is going on here? */ /* GJB:FIXME:: what is going on here? */

View file

@ -1178,8 +1178,8 @@ SCM_DEFINE (scm_set_port_column_x, "set-port-column!", 2, 0, 0,
SCM_DEFINE (scm_port_filename, "port-filename", 1, 0, 0, SCM_DEFINE (scm_port_filename, "port-filename", 1, 0, 0,
(SCM port), (SCM port),
"Return the filename associated with @var{port}. This function returns\n" "Return the filename associated with @var{port}. This function returns\n"
"the strings "standard input", "standard output" and "standard error" "the strings \"standard input\", \"standard output\" and \"standard error\""
when called on the current input, output and error ports respectively.") "when called on the current input, output and error ports respectively.")
#define FUNC_NAME s_scm_port_filename #define FUNC_NAME s_scm_port_filename
{ {
port = SCM_COERCE_OUTPORT (port); port = SCM_COERCE_OUTPORT (port);

View file

@ -1192,10 +1192,9 @@ SCM_DEFINE (scm_mknod, "mknod", 4, 0, 0,
"being created.\n\n" "being created.\n\n"
"E.g.,\n" "E.g.,\n"
"@example\n" "@example\n"
"(mknod \"/dev/fd0\" 'block-special #o660 (+ (* 2 256) 2)") "(mknod \"/dev/fd0\" 'block-special #o660 (+ (* 2 256) 2))"
@end example "@end example\n"
"The return value is unspecified.")
The return value is unspecified.")
#define FUNC_NAME s_scm_mknod #define FUNC_NAME s_scm_mknod
{ {
int val; int val;

View file

@ -209,8 +209,7 @@ static long scm_my_base = 0;
SCM_DEFINE (scm_get_internal_run_time, "get-internal-run-time", 0, 0, 0, SCM_DEFINE (scm_get_internal_run_time, "get-internal-run-time", 0, 0, 0,
(void), (void),
"Returns the number of time units of processor time used by the interpreter.\n" "Returns the number of time units of processor time used by the interpreter.\n"
"Both "system" and "user" time "Both \"system\" and \"user\" time are included but subprocesses are not.")
are included but subprocesses are not.")
#define FUNC_NAME s_scm_get_internal_run_time #define FUNC_NAME s_scm_get_internal_run_time
{ {
return scm_long2num(mytime()-scm_my_base); return scm_long2num(mytime()-scm_my_base);
@ -234,9 +233,9 @@ SCM_DEFINE (scm_current_time, "current-time", 0, 0, 0,
SCM_DEFINE (scm_gettimeofday, "gettimeofday", 0, 0, 0, SCM_DEFINE (scm_gettimeofday, "gettimeofday", 0, 0, 0,
(void), (void),
"Returns a pair containing the number of seconds and microseconds since "Returns a pair containing the number of seconds and microseconds since\n"
1970-01-01 00:00:00 UTC, excluding leap seconds. Note: whether true "1970-01-01 00:00:00 UTC, excluding leap seconds. Note: whether true\n"
microsecond resolution is available depends on the operating system.") "microsecond resolution is available depends on the operating system.")
#define FUNC_NAME s_scm_gettimeofday #define FUNC_NAME s_scm_gettimeofday
{ {
#ifdef HAVE_GETTIMEOFDAY #ifdef HAVE_GETTIMEOFDAY
@ -334,11 +333,11 @@ restorezone (SCM zone, char **oldenv, const char *subr)
SCM_DEFINE (scm_localtime, "localtime", 1, 1, 0, SCM_DEFINE (scm_localtime, "localtime", 1, 1, 0,
(SCM time, SCM zone), (SCM time, SCM zone),
"Returns an object representing the broken down components of @var{time}, "Returns an object representing the broken down components of @var{time},\n"
an integer like the one returned by @code{current-time}. The time zone "an integer like the one returned by @code{current-time}. The time zone\n"
for the calculation is optionally specified by @var{zone} (a string), "for the calculation is optionally specified by @var{zone} (a string),\n"
otherwise the @code{TZ} environment variable or the system default is "otherwise the @code{TZ} environment variable or the system default is\n"
used.") "used.")
#define FUNC_NAME s_scm_localtime #define FUNC_NAME s_scm_localtime
{ {
timet itime; timet itime;
@ -410,9 +409,9 @@ used.")
SCM_DEFINE (scm_gmtime, "gmtime", 1, 0, 0, SCM_DEFINE (scm_gmtime, "gmtime", 1, 0, 0,
(SCM time), (SCM time),
"Returns an object representing the broken down components of @var{time}, "Returns an object representing the broken down components of @var{time},\n"
an integer like the one returned by @code{current-time}. The values "an integer like the one returned by @code{current-time}. The values\n"
are calculated for UTC.") "are calculated for UTC.")
#define FUNC_NAME s_scm_gmtime #define FUNC_NAME s_scm_gmtime
{ {
timet itime; timet itime;
@ -468,14 +467,13 @@ bdtime2c (SCM sbd_time, struct tm *lt, int pos, const char *subr)
SCM_DEFINE (scm_mktime, "mktime", 1, 1, 0, SCM_DEFINE (scm_mktime, "mktime", 1, 1, 0,
(SCM sbd_time, SCM zone), (SCM sbd_time, SCM zone),
"@var{bd-time} is an object representing broken down time and @code{zone} "@var{bd-time} is an object representing broken down time and @code{zone}\n"
is an optional time zone specifier (otherwise the TZ environment variable "is an optional time zone specifier (otherwise the TZ environment variable\n"
or the system default is used). "or the system default is used).\n\n"
"Returns a pair: the CAR is a corresponding\n"
Returns a pair: the CAR is a corresponding "integer time value like that returned\n"
integer time value like that returned "by @code{current-time}; the CDR is a broken down time object, similar to\n"
by @code{current-time}; the CDR is a broken down time object, similar to "as @var{bd-time} but with normalized values.")
as @var{bd-time} but with normalized values.")
#define FUNC_NAME s_scm_mktime #define FUNC_NAME s_scm_mktime
{ {
timet itime; timet itime;
@ -548,10 +546,10 @@ as @var{bd-time} but with normalized values.")
#ifdef HAVE_TZSET #ifdef HAVE_TZSET
SCM_DEFINE (scm_tzset, "tzset", 0, 0, 0, SCM_DEFINE (scm_tzset, "tzset", 0, 0, 0,
(void), (void),
"Initialize the timezone from the TZ environment variable "Initialize the timezone from the TZ environment variable\n"
or the system default. It's not usually necessary to call this procedure "or the system default. It's not usually necessary to call this procedure\n"
since it's done automatically by other procedures that depend on the "since it's done automatically by other procedures that depend on the\n"
timezone.") "timezone.")
#define FUNC_NAME s_scm_tzset #define FUNC_NAME s_scm_tzset
{ {
tzset(); tzset();
@ -562,13 +560,13 @@ timezone.")
SCM_DEFINE (scm_strftime, "strftime", 2, 0, 0, SCM_DEFINE (scm_strftime, "strftime", 2, 0, 0,
(SCM format, SCM stime), (SCM format, SCM stime),
"Formats a time specification @var{time} using @var{template}. @var{time} "Formats a time specification @var{time} using @var{template}. @var{time}\n"
is an object with time components in the form returned by @code{localtime} "is an object with time components in the form returned by @code{localtime}\n"
or @code{gmtime}. @var{template} is a string which can include formatting "or @code{gmtime}. @var{template} is a string which can include formatting\n"
specifications introduced by a @code{%} character. The formatting of "specifications introduced by a @code{%} character. The formatting of\n"
month and day names is dependent on the current locale. The value returned "month and day names is dependent on the current locale. The value returned\n"
is the formatted string. "is the formatted string.\n"
@xref{Formatting Date and Time, , , libc, The GNU C Library Reference Manual}.)") "@xref{Formatting Date and Time, , , libc, The GNU C Library Reference Manual}.)")
#define FUNC_NAME s_scm_strftime #define FUNC_NAME s_scm_strftime
{ {
struct tm t; struct tm t;
@ -605,16 +603,16 @@ is the formatted string.
#ifdef HAVE_STRPTIME #ifdef HAVE_STRPTIME
SCM_DEFINE (scm_strptime, "strptime", 2, 0, 0, SCM_DEFINE (scm_strptime, "strptime", 2, 0, 0,
(SCM format, SCM string), (SCM format, SCM string),
"Performs the reverse action to @code{strftime}, parsing @var{string} "Performs the reverse action to @code{strftime}, parsing @var{string}\n"
according to the specification supplied in @var{template}. The "according to the specification supplied in @var{template}. The\n"
interpretation of month and day names is dependent on the current "interpretation of month and day names is dependent on the current\n"
locale. The "locale. The\n"
value returned is a pair. The CAR has an object with time components "value returned is a pair. The CAR has an object with time components \n"
in the form returned by @code{localtime} or @code{gmtime}, "in the form returned by @code{localtime} or @code{gmtime},\n"
but the time zone components "but the time zone components\n"
are not usefully set. "are not usefully set.\n"
The CDR reports the number of characters from @var{string} which "The CDR reports the number of characters from @var{string} which\n"
vwere used for the conversion.") "vwere used for the conversion.")
#define FUNC_NAME s_scm_strptime #define FUNC_NAME s_scm_strptime
{ {
struct tm t; struct tm t;

View file

@ -157,7 +157,7 @@ st_end_input (SCM port, int offset)
if (pt->read_pos - pt->read_buf < offset) if (pt->read_pos - pt->read_buf < offset)
scm_misc_error ("st_end_input", "negative position", SCM_EOL); scm_misc_error ("st_end_input", "negative position", SCM_EOL);
pt->write_pos = (unsigned char *) pt->read_pos = pt->read_pos - offset; pt->write_pos = (unsigned char *) (pt->read_pos = pt->read_pos - offset);
pt->rw_active = SCM_PORT_NEITHER; pt->rw_active = SCM_PORT_NEITHER;
} }

View file

@ -458,19 +458,17 @@ SCM_DEFINE (scm_string_to_symbol, "string->symbol", 1, 0, 0,
SCM_DEFINE (scm_string_to_obarray_symbol, "string->obarray-symbol", 2, 1, 0, SCM_DEFINE (scm_string_to_obarray_symbol, "string->obarray-symbol", 2, 1, 0,
(SCM o, SCM s, SCM softp), (SCM o, SCM s, SCM softp),
"Intern a new symbol in @var{obarray}, a symbol table, with name "Intern a new symbol in @var{obarray}, a symbol table, with name\n"
@var{string}. "@var{string}.\n\n"
"If @var{obarray} is @code{#f}, use the default system symbol table. If\n"
If @var{obarray} is @code{#f}, use the default system symbol table. If "@var{obarray} is @code{#t}, the symbol should not be interned in any\n"
@var{obarray} is @code{#t}, the symbol should not be interned in any "symbol table; merely return the pair (@var{symbol}\n"
symbol table; merely return the pair (@var{symbol} ". @var{#<undefined>}).\n\n"
. @var{#<undefined>}). "The @var{soft?} argument determines whether new symbol table entries\n"
"should be created when the specified symbol is not already present in\n"
The @var{soft?} argument determines whether new symbol table entries "@var{obarray}. If @var{soft?} is specified and is a true value, then\n"
should be created when the specified symbol is not already present in "new entries should not be added for symbols not already present in the\n"
@var{obarray}. If @var{soft?} is specified and is a true value, then "table; instead, simply return @code{#f}.")
new entries should not be added for symbols not already present in the
table; instead, simply return @code{#f}.")
#define FUNC_NAME s_scm_string_to_obarray_symbol #define FUNC_NAME s_scm_string_to_obarray_symbol
{ {
SCM vcell; SCM vcell;