Add const to some variables to avoid const_casts

[Hahnfeld]

Summary

In these places the const attribute seems correct and doesn't
need any other change, so let's do it.

[AndreyChurbanov]

LGTM

[Hahnfeld]

Revert changes to __kmp_parse_affinity_env as they did not compile.

[Hahnfeld]

This patch had the same problem as D39755 and I have reverted the changes to __kmp_parse_affinity_env. Would you be able to test this on x86 Linux just to be sure?

[AndreyChurbanov]

LGTM

openmp/trunk/runtime/src/kmp_settings.cpp

 static void __kmp_stg_parse_schedule(char const *name, char const *value,
                                      void *data) {
 
   if (value != NULL) {
     size_t length = KMP_STRLEN(value);
     if (length > INT_MAX) {
       KMP_WARNING(LongValue, name);
     } else {
-      char *semicolon;
+      const char *semicolon;
       if (value[length - 1] == '"' || value[length - 1] == '\'')
         KMP_WARNING(UnbalancedQuotes, name);
       do {
         char sentinel;
 
-        semicolon = CCAST(char *, strchr(value, ';'));
+        semicolon = strchr(value, ';');
         if (*value && semicolon != value) {
-          char *comma = CCAST(char *, strchr(value, ','));
+          const char *comma = strchr(value, ',');
 
           if (comma) {
             ++comma;
             sentinel = ',';
           } else
             sentinel = ';';
           if (!__kmp_strcasecmp_with_sentinel("static", value, sentinel)) {
             if (!__kmp_strcasecmp_with_sentinel("greedy", comma, ';')) {

 // OMP_SCHEDULE
 
 static void __kmp_stg_parse_omp_schedule(char const *name, char const *value,
                                          void *data) {
   size_t length;
   if (value) {
     length = KMP_STRLEN(value);
     if (length) {
-      char *comma = CCAST(char *, strchr(value, ','));
+      const char *comma = strchr(value, ',');
       if (value[length - 1] == '"' || value[length - 1] == '\'')
         KMP_WARNING(UnbalancedQuotes, name);
       /* get the specified scheduling style */
       if (!__kmp_strcasecmp_with_sentinel("dynamic", value, ',')) /* DYNAMIC */
         __kmp_sched = kmp_sch_dynamic_chunked;
       else if (!__kmp_strcasecmp_with_sentinel("guided", value,
                                                ',')) /* GUIDED */
         __kmp_sched = kmp_sch_guided_chunked;

openmp/trunk/runtime/src/kmp_utility.cpp

int __kmp_get_logical_id(int log_per_phy, int apic_id) {
   return ((int)((current_bit - 1) & apic_id));
 }
 
 static kmp_uint64 __kmp_parse_frequency( // R: Frequency in Hz.
     char const *frequency // I: Float number and unit: MHz, GHz, or TGz.
     ) {
 
   double value = 0.0;
-  char const *unit = NULL;
+  char *unit = NULL;
   kmp_uint64 result = 0; /* Zero is a better unknown value than all ones. */
 
   if (frequency == NULL) {
     return result;
   }
-  value = strtod(frequency,
-                 CCAST(char **, &unit)); // strtod() does not like "const"
+  value = strtod(frequency, &unit);
   if (0 < value &&
       value <= DBL_MAX) { // Good value (not overflow, underflow, etc).
     if (strcmp(unit, "MHz") == 0) {
       value = value * 1.0E+6;
     } else if (strcmp(unit, "GHz") == 0) {
       value = value * 1.0E+9;
     } else if (strcmp(unit, "THz") == 0) {
       value = value * 1.0E+12;