From: JINMEI Tatuya Date: Fri, 21 Oct 2011 22:56:35 +0000 (-0700) Subject: [869] (unrelated cleanup) some coding guideline fixes; more explicit about #include. X-Git-Tag: perftcpdns_before_epoll~35^2~24^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46e8133ce6aced930a85be2536b5cf1e493e9ab2;p=thirdparty%2Fkea.git [869] (unrelated cleanup) some coding guideline fixes; more explicit about #include. --- diff --git a/src/bin/auth/common.cc b/src/bin/auth/common.cc index 35381a1d49..a7031f3c57 100644 --- a/src/bin/auth/common.cc +++ b/src/bin/auth/common.cc @@ -12,22 +12,25 @@ // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR // PERFORMANCE OF THIS SOFTWARE. +#include + #include #include #include using std::string; -string getXfroutSocketPath() { +string +getXfroutSocketPath() { if (getenv("B10_FROM_BUILD") != NULL) { - if (getenv("B10_FROM_SOURCE_LOCALSTATEDIR")) { + if (getenv("B10_FROM_SOURCE_LOCALSTATEDIR") != NULL) { return (string(getenv("B10_FROM_SOURCE_LOCALSTATEDIR")) + "/auth_xfrout_conn"); } else { return (string(getenv("B10_FROM_BUILD")) + "/auth_xfrout_conn"); } } else { - if (getenv("BIND10_XFROUT_SOCKET_FILE")) { + if (getenv("BIND10_XFROUT_SOCKET_FILE") != NULL) { return (getenv("BIND10_XFROUT_SOCKET_FILE")); } else { return (UNIX_SOCKET_FILE);