https://issues.shibboleth.net/jira/browse/CPPXT-90

[shibboleth/cpp-xmltooling.git] / xmltooling / util / DateTime.cpp

diff --git a/xmltooling/util/DateTime.cpp b/xmltooling/util/DateTime.cpp
index 9183420..64fe2eb 100644 (file)
--- a/xmltooling/util/DateTime.cpp
+++ b/xmltooling/util/DateTime.cpp
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2009 Internet2
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
@@ -27,6 +31,7 @@
  */
 
 #include "internal.h"
+#include "unicode.h"
 #include "util/DateTime.h"
 
 #ifndef WIN32
@@ -1311,18 +1316,17 @@ double DateTime::parseMiliSecond(const int start, const int end) const
     XMLString::copyNString(miliSecData, &(fBuffer[start-1]), miliSecLen);
     *(miliSecData + miliSecLen) = chNull;
 
-    char *nptr = XMLString::transcode(miliSecData);
-    ArrayJanitor<char> jan(nptr);
-    size_t   strLen = strlen(nptr);
+    auto_ptr_char nptr(miliSecData);
+    size_t   strLen = strlen(nptr.get());
     char *endptr = 0;
     errno = 0;
 
     //printf("milisec=<%s>\n", nptr);
 
-    double retVal = strtod(nptr, &endptr);
+    double retVal = strtod(nptr.get(), &endptr);
 
     // check if all chars are valid char
-    if ( (endptr - nptr) != strLen)
+    if ( (endptr - nptr.get()) != strLen)
         throw XMLParserException("Invalid non-numeric characters.");
 
     // we don't check underflow occurs since