#include <afsconfig.h>
#include <afs/param.h>
+#include <roken.h>
-#include <stdio.h>
-#include <string.h>
#include <ctype.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
#include "rpc_scan.h"
#include "rpc_parse.h"
#include "rpc_util.h"
static void pconstdef(definition * def);
static void pstructdef(definition * def);
static void puniondef(definition * def);
-static void puldefine(char *name, char *num);
-static int define_printed(proc_list * stop, version_list * start);
-static void pprogramdef(definition * def);
static void psproc1(definition * defp, int callTconnF, char *type,
char *prefix, int iomask);
static void psprocdef(definition * defp);
case DEF_TYPEDEF:
ptypedef(def);
break;
- case DEF_PROGRAM:
- pprogramdef(def);
- break;
case DEF_PROC:
psprocdef(def);
break;
default:
break;
}
- if (def->def_kind != DEF_PROGRAM && def->def_kind != DEF_CONST
- && (!IsRxgenDefinition(def))) {
+ if (def->def_kind != DEF_CONST && (!IsRxgenDefinition(def))) {
f_print(fout, "bool_t xdr_%s(XDR *xdrs, %s *objp);\n", def->def_name,
def->def_name);
}
if (decl && !streq(decl->type, "void")) {
pdeclaration(name, decl, 2);
}
- f_print(fout, "\t} %s_u;\n", name);
+ if (brief_flag) {
+ f_print(fout, "\t} u;\n");
+ } else {
+ f_print(fout, "\t} %s_u;\n", name);
+ }
f_print(fout, "};\n");
f_print(fout, "typedef struct %s %s;\n", name, name);
STOREVAL(&uniondef_defined, def);
}
static void
-puldefine(char *name, char *num)
-{
- f_print(fout, "#define %s ((afs_uint32)%s)\n", name, num);
-}
-
-static int
-define_printed(proc_list * stop, version_list * start)
-{
- version_list *vers;
- proc_list *proc;
-
- for (vers = start; vers != NULL; vers = vers->next) {
- for (proc = vers->procs; proc != NULL; proc = proc->next) {
- if (proc == stop) {
- return (0);
- } else if (streq(proc->proc_name, stop->proc_name)) {
- return (1);
- }
- }
- }
- abort();
- return 0;/* NOTREACHED */
-}
-
-
-static void
-pprogramdef(definition * def)
-{
- version_list *vers;
- proc_list *proc;
-
- puldefine(def->def_name, def->def.pr.prog_num);
- for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) {
- puldefine(vers->vers_name, vers->vers_num);
- for (proc = vers->procs; proc != NULL; proc = proc->next) {
- if (!define_printed(proc, def->def.pr.versions)) {
- puldefine(proc->proc_name, proc->proc_num);
- }
- pprocdef(proc, vers);
- }
- }
-}
-
-static void
psproc1(definition * defp, int callTconnF, char *type, char *prefix,
int iomask)
{
f_print(fout, "\nextern %s %s%s%s(\n", type, prefix, defp->pc.proc_prefix,
defp->pc.proc_name);
- if (callTconnF == 1) {
+ if (callTconnF == 1 || callTconnF == 3) {
f_print(fout, "\t/*IN */ struct rx_call *z_call");
} else if (callTconnF == 2) {
f_print(fout, "\tstruct ubik_client *aclient, afs_int32 aflags");
&& (iomask & (1 << plist->pl.param_kind))) {
switch (plist->pl.param_kind) {
case DEF_INPARAM:
- f_print(fout, ",\n\t/*IN */ ");
+ f_print(fout, ",\n\t/*IN %d*/ ",callTconnF);
+ if ((callTconnF != 3)
+ && strcmp(plist->pl.param_type, "char *")== 0)
+ f_print(fout, "const ");
break;
case DEF_OUTPARAM:
f_print(fout, ",\n\t/*OUT*/ ");
if (!(!multi_flag && split_flag))
psproc1(defp, 0, "int", "", 0xFFFFFFFF);
- if (uflag && !kflag)
+ if (uflag && !kflag) {
+ f_print(fout, "\n#ifndef KERNEL");
psproc1(defp, 2, "int", "ubik_", 0xFFFFFFFF);
+ f_print(fout, "#endif /* KERNEL */\n");
+ }
if (*ServerPrefix)
- psproc1(defp, 1, "afs_int32", ServerPrefix, 0xFFFFFFFF);
-}
-
-
-void
-pprocdef(proc_list * proc, version_list * vp)
-{
- f_print(fout, "extern ");
- if (proc->res_prefix) {
- if (streq(proc->res_prefix, "enum")) {
- f_print(fout, "enum ");
- } else {
- f_print(fout, "struct ");
- }
- }
- if (streq(proc->res_type, "bool")) {
- f_print(fout, "bool_t *");
- } else if (streq(proc->res_type, "string")) {
- f_print(fout, "char **");
- } else {
- f_print(fout, "%s *", fixtype(proc->res_type));
- }
- pvname(proc->proc_name, vp->vers_num);
- f_print(fout, "();\n");
+ psproc1(defp, 3, "afs_int32", ServerPrefix, 0xFFFFFFFF);
}
static void
if (streq(old, "string")) {
old = "char";
rel = REL_POINTER;
- } else if (streq(old, "opaque")) {
+ } else if (!brief_flag && streq(old, "opaque")) {
old = "char";
} else if (streq(old, "bool")) {
old = "bool_t";
f_print(fout, "typedef ");
switch (rel) {
case REL_ARRAY:
- f_print(fout, "struct %s {\n", name);
- f_print(fout, "\tu_int %s_len;\n", name);
- f_print(fout, "\t%s%s *%s_val;\n", prefix, old, name);
- f_print(fout, "} %s", name);
+ if (brief_flag) {
+ if (streq(old, "opaque")) {
+ f_print(fout, "struct rx_opaque %s", name);
+ } else {
+ f_print(fout, "struct {\n");
+ f_print(fout, "\tu_int len;\n");
+ f_print(fout, "\t%s%s *val;\n", prefix, old);
+ f_print(fout, "} %s", name);
+ }
+ } else {
+ f_print(fout, "struct %s {\n", name);
+ f_print(fout, "\tu_int %s_len;\n", name);
+ f_print(fout, "\t%s%s *%s_val;\n", prefix, old, name);
+ f_print(fout, "} %s", name);
+ }
break;
case REL_POINTER:
f_print(fout, "%s%s *%s", prefix, old, name);
f_print(fout, "%s%s *%s", prefix, type, dec->name);
break;
case REL_ARRAY:
- f_print(fout, "struct %s {\n", dec->name);
- tabify(fout, tab);
- f_print(fout, "\tu_int %s_len;\n", dec->name);
- tabify(fout, tab);
- f_print(fout, "\t%s%s *%s_val;\n", prefix, type, dec->name);
- tabify(fout, tab);
- f_print(fout, "} %s", dec->name);
+ if (brief_flag) {
+ if (streq(dec->type, "opaque")) {
+ f_print(fout, "struct rx_opaque %s",dec->name);
+ } else {
+ f_print(fout, "struct {\n");
+ tabify(fout, tab);
+ f_print(fout, "\tu_int len;\n");
+ tabify(fout, tab);
+ f_print(fout, "\t%s%s *val;\n", prefix, type);
+ tabify(fout, tab);
+ f_print(fout, "} %s", dec->name);
+ }
+ } else {
+ f_print(fout, "struct %s {\n", dec->name);
+ tabify(fout, tab);
+ f_print(fout, "\tu_int %s_len;\n", dec->name);
+ tabify(fout, tab);
+ f_print(fout, "\t%s%s *%s_val;\n", prefix, type, dec->name);
+ tabify(fout, tab);
+ f_print(fout, "} %s", dec->name);
+ }
break;
}
}
for (l = defined; l != NULL; l = l->next) {
def = (definition *) l->val;
- if (def->def_kind != DEF_PROGRAM) {
- if (streq(def->def_name, stop)) {
- return (1);
- } else if (streq(def->def_name, type)) {
- return (0);
- }
+ if (streq(def->def_name, stop)) {
+ return (1);
+ } else if (streq(def->def_name, type)) {
+ return (0);
}
}
return (1);
git://git.openafs.org / openafs.git / blobdiff