1. Fix some typos in README.

2. Use int32_t instead of long for rpcgen.

7 files changed, 13 insertions, 13 deletions

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"},