diff options
| author | Greg Banks <gnb@melbourne.sgi.com> | 2006-07-03 14:21:48 +1000 |
|---|---|---|
| committer | Greg Banks <gnb@melbourne.sgi.com> | 2006-07-03 14:21:48 +1000 |
| commit | 940c7c304d4a43c00c27529cdddc7c87db6eef87 (patch) | |
| tree | b2d1f4d190afd1c21e8e31eada9d6e58cfa0f93b /tools | |
| parent | b90d201551aaa712c011c3d5de900fad714a26a6 (diff) | |
| parent | a503848d423fe1681879936da7b526b15f7eca23 (diff) | |
| download | nfs-utils-940c7c304d4a43c00c27529cdddc7c87db6eef87.tar.gz nfs-utils-940c7c304d4a43c00c27529cdddc7c87db6eef87.tar.xz nfs-utils-940c7c304d4a43c00c27529cdddc7c87db6eef87.zip | |
Merge branch 'master' of git://linux-nfs.org/nfs-utils
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/rpcgen/rpc_parse.c | 11 | ||||
| -rw-r--r-- | tools/rpcgen/rpc_scan.c | 1 |
2 files changed, 2 insertions, 10 deletions
diff --git a/tools/rpcgen/rpc_parse.c b/tools/rpcgen/rpc_parse.c index 2a2b7e0..52300a4 100644 --- a/tools/rpcgen/rpc_parse.c +++ b/tools/rpcgen/rpc_parse.c @@ -94,6 +94,7 @@ get_definition(void) def_const(defp); break; case TOK_EOF: + free(defp); return (NULL); default: error("definition keyword expected"); @@ -290,7 +291,6 @@ def_union(definition *defp) declaration dec; case_list *cases; case_list **tailp; - int flag; defp->def_kind = DEF_UNION; scan(TOK_IDENT, &tok); @@ -309,7 +309,6 @@ def_union(definition *defp) cases->case_name = tok.str; scan(TOK_COLON, &tok); /* now peek at next token */ - flag=0; if(peekscan(TOK_CASE,&tok)) { @@ -325,14 +324,6 @@ def_union(definition *defp) }while(peekscan(TOK_CASE,&tok)); } - else - if(flag) - { - - *tailp = cases; - tailp = &cases->next; - cases = ALLOC(case_list); - }; get_declaration(&dec, DEF_UNION); cases->case_decl = dec; diff --git a/tools/rpcgen/rpc_scan.c b/tools/rpcgen/rpc_scan.c index c0ddc14..a6f442c 100644 --- a/tools/rpcgen/rpc_scan.c +++ b/tools/rpcgen/rpc_scan.c @@ -468,6 +468,7 @@ docppline(char *line, int *lineno, char **fname) *p = 0; if (*file == 0) { *fname = NULL; + free(file); } else { *fname = file; } |