X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=ovsdb%2Fovsdb-tool.c;h=f5412f36b7b5295881ebdc117895559b84bf1b4f;hb=74f868c624b8140739d2c4d84bdf8c2c9623a356;hp=ecf998b38ff392a15e46ca9020247b24a62c5c42;hpb=8a07709cb80462edb32fc11d056bfc08ce90f62d;p=openvswitch diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c index ecf998b3..f5412f36 100644 --- a/ovsdb/ovsdb-tool.c +++ b/ovsdb/ovsdb-tool.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -252,6 +252,10 @@ compact_or_convert(const char *src_name, const char *dst_name, } lockfile_unlock(dst_lock); + + if (in_place) { + free((char *) dst_name); + } } static void @@ -509,7 +513,7 @@ do_show_log(int argc, char *argv[]) time_t t = json_integer(date); char s[128]; - strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S", localtime(&t)); + strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S", gmtime(&t)); printf(" %s", s); }