Changeset 10738

Timestamp:

Dec 14, 2006, 1:11:26 PM (20 years ago)

Author:

eugene

Message:

added error reporting for mis-formed time strings (not completed)

File:

• trunk/ippTools/src/dettool.c (modified) (8 diffs)

trunk/ippTools/src/dettool.c

@@ -298 +298 @@
         if (registeredStr) {
             registered = psTimeFromISO(registeredStr, PS_TIME_UTC);
+            if (!registered) {
+                psError(PS_ERR_UNKNOWN, false, "error in time format %s", registeredStr);
+                return false;
+            }
         } else {
             registered = NULL;
@@ -313 +317 @@
         if (use_beginStr) {
             use_begin = psTimeFromISO(use_beginStr, PS_TIME_UTC);
+            if (!use_begin) {
+                psError(PS_ERR_UNKNOWN, false, "error in time format %s", use_beginStr);
+                return false;
+            }
         } else {
             use_begin = NULL;
@@ -328 +336 @@
         if (use_endStr) {
             use_end = psTimeFromISO(use_endStr, PS_TIME_UTC);
+            if (!use_end) {
+                psError(PS_ERR_UNKNOWN, false, "error in time format %s", use_endStr);
+                return false;
+            }
         } else {
             use_end = NULL;
@@ -614 +626 @@
         if (dateobs_begin) {
             psTime *time = psTimeFromISO(dateobs_begin, PS_TIME_UTC);
+            if (!time) {
+                psError(PS_ERR_UNKNOWN, false, "error in time format %s", dateobs_begin);
+                psFree(time);
+                psFree(where);
+                return false;
+            }
             if (!psMetadataAddTime(where, PS_LIST_TAIL, "dateobs", PS_META_DUPLICATE_OK, ">=", time)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item dateobs");
@@ -631 +649 @@
         if (dateobs_end) {
             psTime *time = psTimeFromISO(dateobs_end, PS_TIME_UTC);
+            if (!time) {
+                psError(PS_ERR_UNKNOWN, false, "error in time format %s", dateobs_end);
+                psFree(time);
+                psFree(where);
+                return false;
+            }
             if (!psMetadataAddTime(where, PS_LIST_TAIL, "dateobs", PS_META_DUPLICATE_OK, "<", time)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item dateobs");
@@ -714 +738 @@
         if (registeredStr) {
             registered = psTimeFromISO(registeredStr, PS_TIME_UTC);
+            if (!registered) {
+                psError(PS_ERR_UNKNOWN, false, "error in time format %s", registeredStr);
+                return false;
+            }
         } else {
             registered = NULL;
@@ -729 +757 @@
         if (use_beginStr) {
             use_begin = psTimeFromISO(use_beginStr, PS_TIME_UTC);
+            if (!use_begin) {
+                psError(PS_ERR_UNKNOWN, false, "error in time format %s", use_beginStr);
+                return false;
+            }
         } else {
             use_begin = NULL;
@@ -744 +776 @@
         if (use_endStr) {
             use_end = psTimeFromISO(use_endStr, PS_TIME_UTC);
+            if (!use_end) {
+                psError(PS_ERR_UNKNOWN, false, "error in time format %s", use_endStr);
+                return false;
+            }
         } else {
             use_end = NULL;