Print this page
make: fix GCC warnings

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/make/bin/main.cc
          +++ new/usr/src/cmd/make/bin/main.cc
↓ open down ↓ 200 lines elided ↑ open up ↑
 201  201          extern  FILE*           dmake_ofp;
 202  202          extern  int             rxmPid;
 203  203          extern  XDR             xdrs_out;
 204  204  #endif
 205  205  #ifdef TEAMWARE_MAKE_CMN
 206  206          extern  char            verstring[];
 207  207  #endif
 208  208  
 209  209  jmp_buf jmpbuffer;
 210  210  #if !defined(linux)
 211      -nl_catd catd;
      211 +extern nl_catd catd;
 212  212  #endif
 213  213  
 214  214  /*
 215  215   *      main(argc, argv)
 216  216   *
 217  217   *      Parameters:
 218  218   *              argc                    You know what this is
 219  219   *              argv                    You know what this is
 220  220   *
 221  221   *      Static variables used:
↓ open down ↓ 1218 lines elided ↑ open up ↑
1440 1440                          }
1441 1441                          switch (makefile_next) {
1442 1442                          case 0:
1443 1443                                  argv[i] = NULL;
1444 1444                                  /* This shouldn't happen */
1445 1445                                  if (k) {
1446 1446                                          argv[k] = NULL;
1447 1447                                  }
1448 1448                                  break;
1449 1449                          case 1: /* -f seen */
1450      -                                argv[i] = NOCATGETS("-f");
     1450 +                                argv[i] = (char *)NOCATGETS("-f");
1451 1451                                  break;
1452 1452                          case 2: /* -c seen */
1453      -                                argv[i] = NOCATGETS("-c");
     1453 +                                argv[i] = (char *)NOCATGETS("-c");
1454 1454  #ifndef TEAMWARE_MAKE_CMN
1455 1455                                  warning(catgets(catd, 1, 281, "Ignoring DistributedMake -c option"));
1456 1456  #endif
1457 1457                                  break;
1458 1458                          case 4: /* -g seen */
1459      -                                argv[i] = NOCATGETS("-g");
     1459 +                                argv[i] = (char *)NOCATGETS("-g");
1460 1460  #ifndef TEAMWARE_MAKE_CMN
1461 1461                                  warning(catgets(catd, 1, 282, "Ignoring DistributedMake -g option"));
1462 1462  #endif
1463 1463                                  break;
1464 1464                          case 8: /* -j seen */
1465      -                                argv[i] = NOCATGETS("-j");
     1465 +                                argv[i] = (char *)NOCATGETS("-j");
1466 1466  #ifndef TEAMWARE_MAKE_CMN
1467 1467                                  warning(catgets(catd, 1, 283, "Ignoring DistributedMake -j option"));
1468 1468  #endif
1469 1469                                  break;
1470 1470                          case 16: /* -M seen */
1471      -                                argv[i] = NOCATGETS("-M");
     1471 +                                argv[i] = (char *)NOCATGETS("-M");
1472 1472  #ifndef TEAMWARE_MAKE_CMN
1473 1473                                  warning(catgets(catd, 1, 284, "Ignoring ParallelMake -M option"));
1474 1474  #endif
1475 1475                                  break;
1476 1476                          case 32: /* -m seen */
1477      -                                argv[i] = NOCATGETS("-m");
     1477 +                                argv[i] = (char *)NOCATGETS("-m");
1478 1478  #ifndef TEAMWARE_MAKE_CMN
1479 1479                                  warning(catgets(catd, 1, 285, "Ignoring DistributedMake -m option"));
1480 1480  #endif
1481 1481                                  break;
1482 1482  #ifndef PARALLEL
1483 1483                          case 128: /* -O seen */
1484      -                                argv[i] = NOCATGETS("-O");
     1484 +                                argv[i] = (char *)NOCATGETS("-O");
1485 1485                                  break;
1486 1486  #endif
1487 1487                          case 256: /* -K seen */
1488      -                                argv[i] = NOCATGETS("-K");
     1488 +                                argv[i] = (char *)NOCATGETS("-K");
1489 1489                                  break;
1490 1490                          case 512:       /* -o seen */
1491      -                                argv[i] = NOCATGETS("-o");
     1491 +                                argv[i] = (char *)NOCATGETS("-o");
1492 1492  #ifndef TEAMWARE_MAKE_CMN
1493 1493                                  warning(catgets(catd, 1, 311, "Ignoring DistributedMake -o option"));
1494 1494  #endif
1495 1495                                  break;
1496 1496                          case 1024: /* -x seen */
1497      -                                argv[i] = NOCATGETS("-x");
     1497 +                                argv[i] = (char *)NOCATGETS("-x");
1498 1498  #ifndef TEAMWARE_MAKE_CMN
1499 1499                                  warning(catgets(catd, 1, 353, "Ignoring DistributedMake -x option"));
1500 1500  #endif
1501 1501                                  break;
1502 1502                          default: /* > 1 of -c, f, g, j, K, M, m, O, o, x seen */
1503 1503                                  fatal(catgets(catd, 1, 286, "Illegal command line. More than one option requiring\nan argument given in the same argument group"));
1504 1504                          }
1505 1505  
1506 1506                          makefile_next = 0;
1507 1507                          current_optind = optind;
↓ open down ↓ 135 lines elided ↑ open up ↑
1643 1643                          while (cp && *cp && !isspace(*cp)) {
1644 1644                                  if(*cp == (int) backslash_char) {
1645 1645                                          cp++;
1646 1646                                  }
1647 1647                                  cp++;
1648 1648                          }
1649 1649                  }
1650 1650          }
1651 1651          /* Allocate memory for the new MAKEFLAGS argv */
1652 1652          mf_argv = (char **) malloc((mf_argc + 1) * sizeof(char *));
1653      -        mf_argv[0] = NOCATGETS("MAKEFLAGS");
     1653 +        mf_argv[0] = (char *)NOCATGETS("MAKEFLAGS");
1654 1654          /*
1655 1655           * Convert the MAKEFLAGS string value into a vector of char *,
1656 1656           * similar to argv.
1657 1657           */
1658 1658          cp = cp_orig;
1659 1659          for (i = 1; i < mf_argc; i++) {
1660 1660                  /* Skip white spaces */
1661 1661                  while (cp && *cp && isspace(*cp)) {
1662 1662                          cp++;
1663 1663                  }
↓ open down ↓ 1349 lines elided ↑ open up ↑
3013 3013                  }
3014 3014          }
3015 3015  }
3016 3016  
3017 3017  /*
3018 3018   * Append the DMake option and value to the MAKEFLAGS string.
3019 3019   */
3020 3020  static void
3021 3021  append_makeflags_string(Name name, register String makeflags_string)
3022 3022  {
3023      -        char            *option;
     3023 +        const char      *option;
3024 3024  
3025 3025          if (strcmp(name->string_mb, NOCATGETS("DMAKE_GROUP")) == 0) {
3026 3026                  option = NOCATGETS(" -g ");
3027 3027          } else if (strcmp(name->string_mb, NOCATGETS("DMAKE_MAX_JOBS")) == 0) {
3028 3028                  option = NOCATGETS(" -j ");
3029 3029          } else if (strcmp(name->string_mb, NOCATGETS("DMAKE_MODE")) == 0) {
3030 3030                  option = NOCATGETS(" -m ");
3031 3031          } else if (strcmp(name->string_mb, NOCATGETS("DMAKE_ODIR")) == 0) {
3032 3032                  option = NOCATGETS(" -o ");
3033 3033          } else if (strcmp(name->string_mb, NOCATGETS("DMAKE_RCFILE")) == 0) {
↓ open down ↓ 748 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX