From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 6 Sep 2012 01:13:07 +0000 (-0400)
Subject: [Bug 2264] Cleanup SEL240X Refclock
X-Git-Tag: NTP_4_2_7P304~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac661e0a4980226cb33f0466a1c883b196ea869b;p=thirdparty%2Fntp.git

[Bug 2264] Cleanup SEL240X Refclock

bk: 5047f8a3plm18b3h2O0rg5HQRv1w4g
---

diff --git a/ChangeLog b/ChangeLog
index 31a596617..6287f372c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2264] Cleanup SEL240X Refclock.
 (4.2.7p303) 2012/09/05 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1232] Add nanosecond support to SHM driver.
 (4.2.7p302) 2012/09/05 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/libparse/clk_sel240x.c b/libparse/clk_sel240x.c
index db4cc7012..0dd606f85 100644
--- a/libparse/clk_sel240x.c
+++ b/libparse/clk_sel240x.c
@@ -1,32 +1,16 @@
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2009 -
+// Copyright (c) 2009,2012 -
 //        Schweitzer Engineering Laboratories, Inc. <opensource@selinc.com>
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//   1. Redistributions of source code must retain the above copyright
-//      notice, this list of conditions and the following disclaimer.
-//   2. Redistributions in binary form must reproduce the above copyright
-//      notice, this list of conditions and the following disclaimer in
-//      the documentation and/or other materials provided with the
-//      distribution.
-//   3. The name of the author may not be used to endorse or promote
-//      products derived from this software without specific prior
-//      written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-// IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-// NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //////////////////////////////////////////////////////////////////////////////
+
+// Need to have _XOPEN_SOURCE defined for time.h to give the 
+// correct strptime signature.  As per feature_test_macros(7),
+// define this before including any header files.
+
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE
+#endif
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -49,7 +33,6 @@
 # include "sys/parsestreams.h"
 #endif
 
-#define _XOPEN_SOURCE
 #include <time.h>
 
 //////////////////////////////////////////////////////////////////////////////
@@ -92,7 +75,7 @@ static struct format sel240x_fmt =
     {  0, 0 },
     {  0, 0 }
   },
-  "\x01    :   :  :  :   \x0d\x0a",
+  (const unsigned char *)"\x01    :   :  :  :   \x0d\x0a",
   0
 };
 
@@ -156,7 +139,8 @@ cvt_sel240x( unsigned char *buffer,
 	{
 		struct tm ptime;
 		buffer++;
-		buffer = strptime( buffer, "%Y:%j:%H:%M:%S", &ptime );
+		buffer = (unsigned char *) strptime( 
+			(const char *)buffer, "%Y:%j:%H:%M:%S", &ptime );
 		if( *(buffer+1) != '\x0d' )
 		{
 			rc = CVT_FAIL | CVT_BADFMT;