Pre-YAPC consting fun

Message-ID: <20050623190423.GA13835@petdance.com>

p4raw-id: //depot/perl@24965

1 files changed, 17 insertions, 22 deletions

diff --git a/locale.c b/locale.c
index 5282146f66..77a83fd850 100644
--- a/locale.c
+++ b/locale.c
@@ -53,24 +53,19 @@
 STATIC char *
 S_stdize_locale(pTHX_ char *locs)
 {
-    char *s;
+    const char *s = strchr(locs, '=');
     bool okay = TRUE;
 
-    if ((s = strchr(locs, '='))) {
-	char *t;
-
+    if (s) {
+	const char * const t = strchr(s, '.');
 	okay = FALSE;
-	if ((t = strchr(s, '.'))) {
-	    char *u;
-
-	    if ((u = strchr(t, '\n'))) {
-
-		if (u[1] == 0) {
-		    STRLEN len = u - s;
-		    Move(s + 1, locs, len, char);
-		    locs[len] = 0;
-		    okay = TRUE;
-		}
+	if (t) {
+	    const char * const u = strchr(t, '\n');
+	    if (u && (u[1] == 0)) {
+		const STRLEN len = u - s;
+		Move(s + 1, locs, len, char);
+		locs[len] = 0;
+		okay = TRUE;
 	    }
 	}
     }
@@ -112,7 +107,7 @@ Perl_set_numeric_radix(pTHX)
  * Set up for a new numeric locale.
  */
 void
-Perl_new_numeric(pTHX_ char *newnum)
+Perl_new_numeric(pTHX_ const char *newnum)
 {
 #ifdef USE_LOCALE_NUMERIC
 
@@ -172,7 +167,7 @@ Perl_set_numeric_local(pTHX)
  * Set up for a new ctype locale.
  */
 void
-Perl_new_ctype(pTHX_ char *newctype)
+Perl_new_ctype(pTHX_ const char *newctype)
 {
 #ifdef USE_LOCALE_CTYPE
     dVAR;
@@ -188,14 +183,14 @@ Perl_new_ctype(pTHX_ char *newctype)
     }
 
 #endif /* USE_LOCALE_CTYPE */
-    (void)newctype;
+    PERL_UNUSED_ARG(newctype);
 }
 
 /*
  * Set up for a new collation locale.
  */
 void
-Perl_new_collate(pTHX_ char *newcoll)
+Perl_new_collate(pTHX_ const char *newcoll)
 {
 #ifdef USE_LOCALE_COLLATE
 
@@ -223,9 +218,9 @@ Perl_new_collate(pTHX_ char *newcoll)
 	  /* 50: surely no system expands a char more. */
 #define XFRMBUFSIZE  (2 * 50)
 	  char xbuf[XFRMBUFSIZE];
-	  Size_t fa = strxfrm(xbuf, "a",  XFRMBUFSIZE);
-	  Size_t fb = strxfrm(xbuf, "ab", XFRMBUFSIZE);
-	  SSize_t mult = fb - fa;
+	  const Size_t fa = strxfrm(xbuf, "a",  XFRMBUFSIZE);
+	  const Size_t fb = strxfrm(xbuf, "ab", XFRMBUFSIZE);
+	  const SSize_t mult = fb - fa;
 	  if (mult < 1)
 	      Perl_croak(aTHX_ "strxfrm() gets absurd");
 	  PL_collxfrm_base = (fa > (Size_t)mult) ? (fa - mult) : 0;