]> granicus.if.org Git - postgresql/commitdiff
Fix case where "PM" to_timestamp() mask was eating too many characters.
authorBruce Momjian <bruce@momjian.us>
Sun, 3 Sep 2006 01:22:56 +0000 (01:22 +0000)
committerBruce Momjian <bruce@momjian.us>
Sun, 3 Sep 2006 01:22:56 +0000 (01:22 +0000)
Report from Josh Tolley.

src/backend/utils/adt/formatting.c

index 3431a063cc8ff10ad12e09d8a34fcb76fe2a9115..1a711090bd03ba75c8ab186eadb84e35c0bc1bd0 100644 (file)
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.110 2006/04/19 18:49:09 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.111 2006/09/03 01:22:56 momjian Exp $
  *
  *
  *      Portions Copyright (c) 1999-2006, PostgreSQL Global Development Group
@@ -1762,7 +1762,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
                                        tmfc->am = TRUE;
                                else
                                        AMPM_ERROR;
-                               return strlen(p_inout);
+                               return strlen(P_M_STR);
                        }
                        break;
                case DCH_AM:
@@ -1781,7 +1781,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
                                        tmfc->am = TRUE;
                                else
                                        AMPM_ERROR;
-                               return strlen(p_inout);
+                               return strlen(PM_STR);
                        }
                        break;
                case DCH_a_m:
@@ -1800,7 +1800,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
                                        tmfc->am = TRUE;
                                else
                                        AMPM_ERROR;
-                               return strlen(p_inout);
+                               return strlen(p_m_STR);
                        }
                        break;
                case DCH_am:
@@ -1819,7 +1819,7 @@ dch_time(int arg, char *inout, int suf, bool is_to_char, bool is_interval,
                                        tmfc->am = TRUE;
                                else
                                        AMPM_ERROR;
-                               return strlen(p_inout);
+                               return strlen(pm_STR);
                        }
                        break;
                case DCH_HH: