From e7668254f2f8f7208905c858ffbc84a65bb13815 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 1 Feb 2011 11:24:51 -0800 Subject: [PATCH] daemon: Suppress valgrind warnings from read_pidfile(). The version of valgrind I have in my test VMs doesn't know what F_GETLK does, so it complains that l_pid is uninitialized even though fcntl sets it. Initializing it ourselves before calling the function avoids a series of false-positive warnings about use of uninitialized data. --- lib/daemon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/daemon.c b/lib/daemon.c index c0f168291..9db6c1f8a 100644 --- a/lib/daemon.c +++ b/lib/daemon.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -536,6 +536,7 @@ read_pidfile(const char *pidfile) lck.l_whence = SEEK_SET; lck.l_start = 0; lck.l_len = 0; + lck.l_pid = 0; if (fcntl(fileno(file), F_GETLK, &lck)) { error = errno; VLOG_WARN("%s: fcntl: %s", pidfile, strerror(error)); -- 2.45.2