X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest-jsonrpc.c;h=06b1cf4750dc6c71a5ce6f9b688cf0098b0ec0b1;hb=c0a50086d9e60995b17bdd8a4e1f150caba337d5;hp=da92cec90196a10d296a194e7c0c8c83a5887bd8;hpb=9467fe624698a9b72f81bb1ddfce33a5fc85281c;p=openvswitch diff --git a/tests/test-jsonrpc.c b/tests/test-jsonrpc.c index da92cec9..06b1cf47 100644 --- a/tests/test-jsonrpc.c +++ b/tests/test-jsonrpc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,6 +42,7 @@ static void parse_options(int argc, char *argv[]); int main(int argc, char *argv[]) { + proctitle_init(argc, argv); set_program_name(argv[0]); time_init(); vlog_init(); @@ -174,7 +175,7 @@ handle_rpc(struct jsonrpc *rpc, struct jsonrpc_msg *msg, bool *done) } static void -do_listen(int argc UNUSED, char *argv[]) +do_listen(int argc OVS_UNUSED, char *argv[]) { struct pstream *pstream; struct jsonrpc **rpcs; @@ -250,11 +251,12 @@ do_listen(int argc UNUSED, char *argv[]) } poll_block(); } + free(rpcs); + pstream_close(pstream); } - static void -do_request(int argc UNUSED, char *argv[]) +do_request(int argc OVS_UNUSED, char *argv[]) { struct jsonrpc_msg *msg; struct jsonrpc *rpc; @@ -293,7 +295,7 @@ do_request(int argc UNUSED, char *argv[]) } static void -do_notify(int argc UNUSED, char *argv[]) +do_notify(int argc OVS_UNUSED, char *argv[]) { struct jsonrpc_msg *msg; struct jsonrpc *rpc; @@ -325,7 +327,7 @@ do_notify(int argc UNUSED, char *argv[]) } static void -do_help(int argc UNUSED, char *argv[] UNUSED) +do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { usage(); }