about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--time/strftime.c26
-rw-r--r--time/strptime.c8
3 files changed, 23 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index e5c71d4965..a6c56608dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-28  Ulrich Drepper  <drepper@redhat.com>
+
+	* time/strftime.c: Add const where necessary to avoid warnings.
+	* time/strptime.c (strptime_internal): Add casts to avoid warnings.
+
 2000-11-22  Paul Eggert  <eggert@twinsun.com>
 
 	* time/strftime.c (my_strftime): Do not invoke mbrlen with a
diff --git a/time/strftime.c b/time/strftime.c
index 2f99143771..08b5b498a6 100644
--- a/time/strftime.c
+++ b/time/strftime.c
@@ -287,7 +287,7 @@ static const CHAR_T zeroes[16] = /* "0000000000000000" */
 	 else if (to_uppcase)						      \
 	   memcpy_uppcase (p, (s), _n);					      \
 	 else								      \
-	   MEMCPY ((PTR) p, (PTR) (s), _n))
+	   MEMCPY ((PTR) p, (const PTR) (s), _n))
 
 #ifdef COMPILE_WIDE
 # define widen(os, ws, l) \
@@ -791,10 +791,11 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	    goto bad_format;
 #ifdef _NL_CURRENT
 	  if (! (modifier == 'E'
-		 && (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME,
-							NLW(ERA_D_T_FMT)))
+		 && (*(subfmt =
+		       (const CHAR_T *) _NL_CURRENT (LC_TIME,
+						     NLW(ERA_D_T_FMT)))
 		     != '\0')))
-	    subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_T_FMT));
+	    subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_T_FMT));
 #else
 # if HAVE_STRFTIME
 	  goto underlying_strftime;
@@ -885,10 +886,10 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	    goto bad_format;
 #ifdef _NL_CURRENT
 	  if (! (modifier == L_('E')
-		 && (*(subfmt = (CHAR_T *)_NL_CURRENT (LC_TIME,
-						       NLW(ERA_D_FMT)))
+		 && (*(subfmt =
+		       (const CHAR_T *)_NL_CURRENT (LC_TIME, NLW(ERA_D_FMT)))
 		     != L_('\0'))))
-	    subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT));
+	    subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT));
 	  goto subformat;
 #else
 # if HAVE_STRFTIME
@@ -1071,8 +1072,9 @@ my_strftime (s, maxsize, format, tp ut_argument)
 
 	case L_('r'):		/* POSIX.2 extension.  */
 #ifdef _NL_CURRENT
-	  if (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME,
-						 NLW(T_FMT_AMPM))) == L_('\0'))
+	  if (*(subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME,
+						       NLW(T_FMT_AMPM)))
+	      == L_('\0'))
 #endif
 	    subfmt = L_("%I:%M:%S %p");
 	  goto subformat;
@@ -1127,10 +1129,10 @@ my_strftime (s, maxsize, format, tp ut_argument)
 	    goto bad_format;
 #ifdef _NL_CURRENT
 	  if (! (modifier == L_('E')
-		 && (*(subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME,
-							NLW(ERA_T_FMT)))
+		 && (*(subfmt =
+		       (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ERA_T_FMT)))
 		     != L_('\0'))))
-	    subfmt = (CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT));
+	    subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT));
 	  goto subformat;
 #else
 # if HAVE_STRFTIME
diff --git a/time/strptime.c b/time/strptime.c
index e9c10ab760..a527dfdb21 100644
--- a/time/strptime.c
+++ b/time/strptime.c
@@ -725,7 +725,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
 		    {
 		      num_eras = _NL_CURRENT_WORD (LC_TIME,
 						   _NL_TIME_ERA_NUM_ENTRIES);
-		      for (era_cnt = 0; era_cnt < num_eras;
+		      for (era_cnt = 0; era_cnt < (int) num_eras;
 			   ++era_cnt, rp = rp_backup)
 			{
 			  era = _nl_select_era_entry (era_cnt);
@@ -735,7 +735,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
 			      break;
 			    }
 			}
-		      if (era_cnt == num_eras)
+		      if (era_cnt == (int) num_eras)
 			{
 			  era_cnt = -1;
 			  if (*decided == loc)
@@ -764,14 +764,14 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
 		{
 		  num_eras = _NL_CURRENT_WORD (LC_TIME,
 					       _NL_TIME_ERA_NUM_ENTRIES);
-		  for (era_cnt = 0; era_cnt < num_eras;
+		  for (era_cnt = 0; era_cnt < (int) num_eras;
 		       ++era_cnt, rp = rp_backup)
 		    {
 		      era = _nl_select_era_entry (era_cnt);
 		      if (recursive (era->era_format))
 			break;
 		    }
-		  if (era_cnt == num_eras)
+		  if (era_cnt == (int) num_eras)
 		    {
 		      era_cnt = -1;
 		      if (*decided == loc)