From c790e97b504b04aacb914cc8c434977eed218952 Mon Sep 17 00:00:00 2001 From: hjl Date: Thu, 28 Oct 1999 19:57:59 +0000 Subject: [PATCH 1/1] 1. Fix some typos in README. 2. Use int32_t instead of long for rpcgen. --- ChangeLog | 22 +++++++++++++++++++++- README | 9 ++++----- tools/rpcgen/rpc_cout.c | 6 +++--- tools/rpcgen/rpc_hout.c | 2 +- tools/rpcgen/rpc_main.c | 4 ++-- tools/rpcgen/rpc_parse.c | 8 ++++---- tools/rpcgen/rpc_scan.c | 2 +- tools/rpcgen/rpc_scan.h | 2 +- tools/rpcgen/rpc_util.c | 2 +- 9 files changed, 38 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff60dc3..afe22cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Thu Oct 28 12:55:42 1999 H.J. Lu + + * README: Fix a few typos. + + * tools/rpcgen/rpc_cout.c (print_header): Use int32_t instead + of long. + * tools/rpcgen/rpc_hout.c (pdefine): Likewise. + * tools/rpcgen/rpc_main.c (c_initialize): Likewise. + * tools/rpcgen/rpc_parse.c (get_type): Likewise. + (unsigned_dec): Likewise. + * tools/rpcgen/rpc_scan.c (symbols): Likewise. + * tools/rpcgen/rpc_util.c (tokstrings): Likewise. + + * tools/rpcgen/rpc_cout.c (emit_single_in_line): Use INT32 + instead of LONG. + * tools/rpcgen/rpc_parse.c (get_type): Likewise. + (unsigned_dec): Likewise. + * tools/rpcgen/rpc_scan.c (symbols): Likewise. + * tools/rpcgen/rpc_scan.h (tok_kind): Likewise. + * tools/rpcgen/rpc_util.c (tokstrings): Likewise. + Thu Oct 28 11:27:51 EST 1999 Neil Brown * support/include/nfs/export.h addedd NFSEXP_NOSUBTREECHECK @@ -8,7 +29,6 @@ Thu Oct 28 11:27:51 EST 1999 Neil Brown * support/export/rmtab.c: rmtab_read didn't quite do the right thing if a pathname from rmtab was a subdirectory of an export-point - Tue Oct 26 17:22:40 1999 H.J. Lu * README: Updated ftp site. diff --git a/README b/README index 25cfb74..55079ca 100644 --- a/README +++ b/README @@ -37,14 +37,13 @@ If there is no NFS patch for the kernel you are interested in, you have to make a patch closest to your kernel version and apply it by hand. There is a Linux NFS kernel source tree for Linux 2.3, linux-2.3, on -the Linux NFS CVS server. However, it is not maintained. We will need -all the help we can get. To contribute to the Linux NFS project, please -go to +the Linux NFS CVS server. We will need all the help we can get. To +contribute to the Linux NFS project, please go to http://www.linuxnfs.sourceforge.org and login as "beta" with password "beta4u". You register yourself. -please send an email to nfs-admin@linuxnfs.sourceforge.org with +Please send an email to nfs-admin@linuxnfs.sourceforge.org with 1. Your user id on www.linuxnfs.sourceforge.org. 2. The area in NFS you'd like to work on. @@ -58,7 +57,7 @@ http://lists.varesearch.com/lists/listinfo/nfs/ You can subscribe it and search the mailing list archive via a web browser. -The nfs-utils package is avaible from the CVS server: +The nfs-utils package is available from the CVS server: # cvs -z 3 -d:pserver:anonymous@cvs.linuxnfs.sourceforge.org:/cvsroot/nfs co nfs-utils diff --git a/tools/rpcgen/rpc_cout.c b/tools/rpcgen/rpc_cout.c index 9bc20bb..5f4c3e7 100644 --- a/tools/rpcgen/rpc_cout.c +++ b/tools/rpcgen/rpc_cout.c @@ -170,7 +170,7 @@ print_header(definition *def) if (Inline == 0) return; /* May cause lint to complain. but ... */ - f_print(fout, "\t register long *buf;\n\n"); + f_print(fout, "\t register int32_t *buf;\n\n"); } static void @@ -668,14 +668,14 @@ emit_single_in_line(declaration *decl, int flag, relation rel) { free(upp_case); freed=1; - upp_case="LONG"; + upp_case="INT32"; } if(strcmp(upp_case,"U_INT") == 0) { free(upp_case); freed=1; - upp_case="U_LONG"; + upp_case="U_INT32"; } diff --git a/tools/rpcgen/rpc_hout.c b/tools/rpcgen/rpc_hout.c index 06835cd..27ed4d5 100644 --- a/tools/rpcgen/rpc_hout.c +++ b/tools/rpcgen/rpc_hout.c @@ -222,7 +222,7 @@ pdefine(char *name, char *num) static void puldefine(char *name, char *num) { - f_print(fout, "#define %s ((u_long)%s)\n", name, num); + f_print(fout, "#define %s ((u_int32_t)%s)\n", name, num); } static int diff --git a/tools/rpcgen/rpc_main.c b/tools/rpcgen/rpc_main.c index bd1a2c0..9b600f3 100644 --- a/tools/rpcgen/rpc_main.c +++ b/tools/rpcgen/rpc_main.c @@ -426,12 +426,12 @@ c_initialize(void) /* add all the starting basic types */ add_type(1,"int"); - add_type(1,"long"); + add_type(1,"int32_t"); add_type(1,"short"); add_type(1,"bool"); add_type(1,"u_int"); - add_type(1,"u_long"); + add_type(1,"u_int32_t"); add_type(1,"u_short"); } diff --git a/tools/rpcgen/rpc_parse.c b/tools/rpcgen/rpc_parse.c index 1e5b80a..dcbe8db 100644 --- a/tools/rpcgen/rpc_parse.c +++ b/tools/rpcgen/rpc_parse.c @@ -564,8 +564,8 @@ get_type(char **prefixp, char **typep, defkind dkind) *typep = "short"; (void) peekscan(TOK_INT, &tok); break; - case TOK_LONG: - *typep = "long"; + case TOK_INT32: + *typep = "int32_t"; (void) peekscan(TOK_INT, &tok); break; case TOK_VOID: @@ -604,9 +604,9 @@ unsigned_dec(char **typep) *typep = "u_short"; (void) peekscan(TOK_INT, &tok); break; - case TOK_LONG: + case TOK_INT32: get_token(&tok); - *typep = "u_long"; + *typep = "u_int32_"; (void) peekscan(TOK_INT, &tok); break; case TOK_INT: diff --git a/tools/rpcgen/rpc_scan.c b/tools/rpcgen/rpc_scan.c index 07565a1..62d906d 100644 --- a/tools/rpcgen/rpc_scan.c +++ b/tools/rpcgen/rpc_scan.c @@ -382,7 +382,7 @@ static token symbols[] = { {TOK_INT, "int"}, {TOK_UNSIGNED, "unsigned"}, {TOK_SHORT, "short"}, - {TOK_LONG, "long"}, + {TOK_INT32, "int32"}, {TOK_FLOAT, "float"}, {TOK_DOUBLE, "double"}, {TOK_STRING, "string"}, diff --git a/tools/rpcgen/rpc_scan.h b/tools/rpcgen/rpc_scan.h index 0683dbe..cbbe6e4 100644 --- a/tools/rpcgen/rpc_scan.h +++ b/tools/rpcgen/rpc_scan.h @@ -64,7 +64,7 @@ enum tok_kind { TOK_TYPEDEF, TOK_INT, TOK_SHORT, - TOK_LONG, + TOK_INT32, TOK_UNSIGNED, TOK_FLOAT, TOK_DOUBLE, diff --git a/tools/rpcgen/rpc_util.c b/tools/rpcgen/rpc_util.c index 2fd5f59..252b181 100644 --- a/tools/rpcgen/rpc_util.c +++ b/tools/rpcgen/rpc_util.c @@ -352,7 +352,7 @@ static token tokstrings[] = { {TOK_TYPEDEF, "typedef"}, {TOK_INT, "int"}, {TOK_SHORT, "short"}, - {TOK_LONG, "long"}, + {TOK_INT32, "int32"}, {TOK_UNSIGNED, "unsigned"}, {TOK_DOUBLE, "double"}, {TOK_FLOAT, "float"}, -- 2.39.2