Commit a0dd16fb3d76e36c8ebc3edf043ddbc0d3a51b5d
2018-08-15T18:13:17
Don't use `trace_' prefix for FT_COMPONENT arguments. * include/freetype/internal/ftdebug.h (FT_TRACE_COMP, FT_TRACE_COMP_): New auxiliary macros to add `trace_' prefix. (FT_TRACE): Use `FT_TRACE_COMP'. */* (FT_COMPONENT): Updated.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602
diff --git a/ChangeLog b/ChangeLog
index 1f09df7..33ab977 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-08-15 Werner Lemberg <wl@gnu.org>
+
+ Don't use `trace_' prefix for FT_COMPONENT arguments.
+
+ * include/freetype/internal/ftdebug.h (FT_TRACE_COMP,
+ FT_TRACE_COMP_): New auxiliary macros to add `trace_' prefix.
+ (FT_TRACE): Use `FT_TRACE_COMP'.
+
+ */* (FT_COMPONENT): Updated.
+
2018-08-14 Werner Lemberg <wl@gnu.org>
Use formatting string in FT_TRACEX calls for non-simple arguments.
diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h
index d6e8a3a..34f8a00 100644
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@@ -84,11 +84,15 @@ FT_BEGIN_HEADER
#ifdef FT_DEBUG_LEVEL_TRACE
-#define FT_TRACE( level, varformat ) \
- do \
- { \
- if ( ft_trace_levels[FT_COMPONENT] >= level ) \
- FT_Message varformat; \
+ /* we need two macros here to make cpp expand `FT_COMPONENT' */
+#define FT_TRACE_COMP( x ) FT_TRACE_COMP_( x )
+#define FT_TRACE_COMP_( x ) trace_ ## x
+
+#define FT_TRACE( level, varformat ) \
+ do \
+ { \
+ if ( ft_trace_levels[FT_TRACE_COMP( FT_COMPONENT )] >= level ) \
+ FT_Message varformat; \
} while ( 0 )
#else /* !FT_DEBUG_LEVEL_TRACE */
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index dc38153..ef02ed0 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -50,7 +50,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_afcjk
+#define FT_COMPONENT afcjk
/*************************************************************************/
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index 9e7764b..f40b5af 100644
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -29,7 +29,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_afglobal
+#define FT_COMPONENT afglobal
/* get writing system specific header files */
diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c
index 65f0e85..171ceb8 100644
--- a/src/autofit/afhints.c
+++ b/src/autofit/afhints.c
@@ -29,7 +29,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_afhints
+#define FT_COMPONENT afhints
/* Get new segment for given axis. */
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index a90fc1c..21f6669 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -37,7 +37,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_aflatin
+#define FT_COMPONENT aflatin
/* needed for computation of round vs. flat segments */
diff --git a/src/autofit/aflatin2.c b/src/autofit/aflatin2.c
index c5ce043..2576708 100644
--- a/src/autofit/aflatin2.c
+++ b/src/autofit/aflatin2.c
@@ -44,7 +44,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_aflatin2
+#define FT_COMPONENT aflatin2
FT_LOCAL_DEF( FT_Error )
diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c
index 7f9f043..79bc84d 100644
--- a/src/autofit/afmodule.c
+++ b/src/autofit/afmodule.c
@@ -66,7 +66,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_afmodule
+#define FT_COMPONENT afmodule
static FT_Error
@@ -507,7 +507,7 @@
glyph_index, load_flags );
#ifdef FT_DEBUG_LEVEL_TRACE
- if ( ft_trace_levels[FT_COMPONENT] )
+ if ( ft_trace_levels[FT_TRACE_COMP( FT_COMPONENT )] )
{
#endif
af_glyph_hints_dump_points( hints, 0 );
diff --git a/src/autofit/afshaper.c b/src/autofit/afshaper.c
index b2f5d18..486d713 100644
--- a/src/autofit/afshaper.c
+++ b/src/autofit/afshaper.c
@@ -33,7 +33,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_afshaper
+#define FT_COMPONENT afshaper
/*
diff --git a/src/autofit/afwarp.c b/src/autofit/afwarp.c
index 636f01f..2e9d146 100644
--- a/src/autofit/afwarp.c
+++ b/src/autofit/afwarp.c
@@ -34,7 +34,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_afwarp
+#define FT_COMPONENT afwarp
/* The weights cover the range 0/64 - 63/64 of a pixel. Obviously, */
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c
index dc28c40..c04eec4 100644
--- a/src/base/ftbitmap.c
+++ b/src/base/ftbitmap.c
@@ -31,7 +31,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_bitmap
+#define FT_COMPONENT bitmap
static
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index 2cea03c..f110c9e 100644
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -65,7 +65,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_calc
+#define FT_COMPONENT calc
/* transfer sign, leaving a positive number; */
diff --git a/src/base/ftgloadr.c b/src/base/ftgloadr.c
index 475d5cc..3efa461 100644
--- a/src/base/ftgloadr.c
+++ b/src/base/ftgloadr.c
@@ -23,7 +23,7 @@
#include FT_INTERNAL_OBJECTS_H
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gloader
+#define FT_COMPONENT gloader
/*************************************************************************/
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c
index 8bc86a5..a752dbd 100644
--- a/src/base/ftglyph.c
+++ b/src/base/ftglyph.c
@@ -44,7 +44,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_glyph
+#define FT_COMPONENT glyph
/*************************************************************************/
diff --git a/src/base/ftinit.c b/src/base/ftinit.c
index e0f2ccd..f25d80a 100644
--- a/src/base/ftinit.c
+++ b/src/base/ftinit.c
@@ -51,7 +51,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_init
+#define FT_COMPONENT init
#undef FT_USE_MODULE
diff --git a/src/base/ftmm.c b/src/base/ftmm.c
index b0d9d4b..54ab9e7 100644
--- a/src/base/ftmm.c
+++ b/src/base/ftmm.c
@@ -32,7 +32,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_mm
+#define FT_COMPONENT mm
static FT_Error
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 2b44405..e5389ef 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -278,7 +278,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_objs
+#define FT_COMPONENT objs
/*************************************************************************/
@@ -2189,7 +2189,7 @@
{
#undef FT_COMPONENT
-#define FT_COMPONENT trace_raccess
+#define FT_COMPONENT raccess
FT_Memory memory = library->memory;
FT_Error error = FT_ERR( Unknown_File_Format );
@@ -2267,7 +2267,7 @@
return error;
#undef FT_COMPONENT
-#define FT_COMPONENT trace_objs
+#define FT_COMPONENT objs
}
@@ -2295,7 +2295,7 @@
{
#undef FT_COMPONENT
-#define FT_COMPONENT trace_raccess
+#define FT_COMPONENT raccess
#ifdef FT_DEBUG_LEVEL_TRACE
FT_TRACE3(( "Try as dfont: " ));
@@ -2308,7 +2308,7 @@
FT_TRACE3(( "%s\n", error ? "failed" : "successful" ));
#undef FT_COMPONENT
-#define FT_COMPONENT trace_objs
+#define FT_COMPONENT objs
}
@@ -4617,7 +4617,7 @@
#ifdef FT_DEBUG_LEVEL_TRACE
#undef FT_COMPONENT
-#define FT_COMPONENT trace_checksum
+#define FT_COMPONENT checksum
/*
* Computing the MD5 checksum is expensive, unnecessarily distorting a
@@ -4731,7 +4731,7 @@
}
#undef FT_COMPONENT
-#define FT_COMPONENT trace_objs
+#define FT_COMPONENT objs
#endif /* FT_DEBUG_LEVEL_TRACE */
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index 611b4f6..2266ce1 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -38,7 +38,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_outline
+#define FT_COMPONENT outline
static
diff --git a/src/base/ftpsprop.c b/src/base/ftpsprop.c
index 9c5344a..e2c3437 100644
--- a/src/base/ftpsprop.c
+++ b/src/base/ftpsprop.c
@@ -32,7 +32,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_psprops
+#define FT_COMPONENT psprops
FT_BASE_CALLBACK_DEF( FT_Error )
diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c
index c61765b..2740cf4 100644
--- a/src/base/ftrfork.c
+++ b/src/base/ftrfork.c
@@ -32,7 +32,7 @@
#include "ftbase.h"
#undef FT_COMPONENT
-#define FT_COMPONENT trace_raccess
+#define FT_COMPONENT raccess
/*************************************************************************/
diff --git a/src/base/ftstream.c b/src/base/ftstream.c
index 9c8cab3..8a7affa 100644
--- a/src/base/ftstream.c
+++ b/src/base/ftstream.c
@@ -28,7 +28,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_stream
+#define FT_COMPONENT stream
FT_BASE_DEF( void )
diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c
index 5539105..ec7b935 100644
--- a/src/base/ftsynth.c
+++ b/src/base/ftsynth.c
@@ -31,7 +31,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_synth
+#define FT_COMPONENT synth
/*************************************************************************/
diff --git a/src/base/ftsystem.c b/src/base/ftsystem.c
index d761ad9..8fffe48 100644
--- a/src/base/ftsystem.c
+++ b/src/base/ftsystem.c
@@ -154,7 +154,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_io
+#define FT_COMPONENT io
/* We use the macro STREAM_FILE for convenience to extract the */
/* system-specific stream handle from a given FreeType stream object */
diff --git a/src/base/ftutil.c b/src/base/ftutil.c
index eced7bb..403f969 100644
--- a/src/base/ftutil.c
+++ b/src/base/ftutil.c
@@ -30,7 +30,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_memory
+#define FT_COMPONENT memory
/*************************************************************************/
@@ -236,7 +236,7 @@
/*************************************************************************/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_list
+#define FT_COMPONENT list
/* documentation is in ftlist.h */
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 8e17bf5..fee6110 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -48,7 +48,7 @@ THE SOFTWARE.
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_bdfdriver
+#define FT_COMPONENT bdfdriver
typedef struct BDF_CMapRec_
diff --git a/src/bdf/bdflib.c b/src/bdf/bdflib.c
index 8133bc6..e6a4682 100644
--- a/src/bdf/bdflib.c
+++ b/src/bdf/bdflib.c
@@ -49,7 +49,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_bdflib
+#define FT_COMPONENT bdflib
/**************************************************************************
diff --git a/src/cache/ftcbasic.c b/src/cache/ftcbasic.c
index f2b75ee..7589ec3 100644
--- a/src/cache/ftcbasic.c
+++ b/src/cache/ftcbasic.c
@@ -27,7 +27,7 @@
#include "ftccback.h"
#include "ftcerror.h"
-#define FT_COMPONENT trace_cache
+#define FT_COMPONENT cache
/*
diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c
index a9aa5d4..8901472 100644
--- a/src/cache/ftccache.c
+++ b/src/cache/ftccache.c
@@ -25,7 +25,7 @@
#include "ftcerror.h"
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cache
+#define FT_COMPONENT cache
#define FTC_HASH_MAX_LOAD 2
diff --git a/src/cache/ftccmap.c b/src/cache/ftccmap.c
index 47b8b76..1e2269b 100644
--- a/src/cache/ftccmap.c
+++ b/src/cache/ftccmap.c
@@ -28,7 +28,7 @@
#include "ftcerror.h"
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cache
+#define FT_COMPONENT cache
/**************************************************************************
diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index 9be1773..adb0791 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -28,7 +28,7 @@
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cache
+#define FT_COMPONENT cache
static FT_Error
diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c
index c802bf0..43bb25a 100644
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -27,7 +27,7 @@
#include "ftcerror.h"
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cache
+#define FT_COMPONENT cache
/*************************************************************************/
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 997a734..2789d20 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -56,7 +56,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cffdriver
+#define FT_COMPONENT cffdriver
/*************************************************************************/
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index 88f5689..c4d7ddb 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -38,7 +38,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cffgload
+#define FT_COMPONENT cffgload
FT_LOCAL_DEF( FT_Error )
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 015b2c8..1454ec4 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -203,7 +203,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cffload
+#define FT_COMPONENT cffload
/* read an offset from the index's stream current position */
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index b3f0f99..391d188 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -51,7 +51,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cffobjs
+#define FT_COMPONENT cffobjs
/**************************************************************************
diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c
index 4b2ecc5..e152c93 100644
--- a/src/cff/cffparse.c
+++ b/src/cff/cffparse.c
@@ -34,7 +34,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cffparse
+#define FT_COMPONENT cffparse
FT_LOCAL_DEF( FT_Error )
@@ -808,7 +808,7 @@
#ifdef FT_DEBUG_LEVEL_TRACE
/* beautify tracing message */
- if ( ft_trace_levels[FT_COMPONENT] < 4 )
+ if ( ft_trace_levels[FT_TRACE_COMP( FT_COMPONENT )] < 4 )
FT_TRACE1(( "Multiple Master CFFs not supported yet,"
" handling first master design only\n" ));
else
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
index e47cd99..36ccee5 100644
--- a/src/cid/cidgload.c
+++ b/src/cid/cidgload.c
@@ -38,7 +38,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cidgload
+#define FT_COMPONENT cidgload
FT_CALLBACK_DEF( FT_Error )
diff --git a/src/cid/cidload.c b/src/cid/cidload.c
index 1546926..31e6f7e 100644
--- a/src/cid/cidload.c
+++ b/src/cid/cidload.c
@@ -35,7 +35,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cidload
+#define FT_COMPONENT cidload
/* read a single offset */
diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c
index 91c4ed9..72be8e5 100644
--- a/src/cid/cidobjs.c
+++ b/src/cid/cidobjs.c
@@ -38,7 +38,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cidobjs
+#define FT_COMPONENT cidobjs
/**************************************************************************
diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c
index 861c157..9c9f1ca 100644
--- a/src/cid/cidparse.c
+++ b/src/cid/cidparse.c
@@ -33,7 +33,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cidparse
+#define FT_COMPONENT cidparse
/*************************************************************************/
diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c
index 935c112..6d0594e 100644
--- a/src/cid/cidriver.c
+++ b/src/cid/cidriver.c
@@ -41,7 +41,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ciddriver
+#define FT_COMPONENT ciddriver
/*
diff --git a/src/gxvalid/gxvbsln.c b/src/gxvalid/gxvbsln.c
index 8b554fd..278093e 100644
--- a/src/gxvalid/gxvbsln.c
+++ b/src/gxvalid/gxvbsln.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvbsln
+#define FT_COMPONENT gxvbsln
/*************************************************************************/
diff --git a/src/gxvalid/gxvcommn.c b/src/gxvalid/gxvcommn.c
index 4d8a4a2..fba2a97 100644
--- a/src/gxvalid/gxvcommn.c
+++ b/src/gxvalid/gxvcommn.c
@@ -35,7 +35,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvcommon
+#define FT_COMPONENT gxvcommon
/*************************************************************************/
diff --git a/src/gxvalid/gxvfeat.c b/src/gxvalid/gxvfeat.c
index 91500bd..7a9c9b0 100644
--- a/src/gxvalid/gxvfeat.c
+++ b/src/gxvalid/gxvfeat.c
@@ -37,7 +37,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvfeat
+#define FT_COMPONENT gxvfeat
/*************************************************************************/
diff --git a/src/gxvalid/gxvjust.c b/src/gxvalid/gxvjust.c
index c8a9ab6..02d36e7 100644
--- a/src/gxvalid/gxvjust.c
+++ b/src/gxvalid/gxvjust.c
@@ -38,7 +38,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvjust
+#define FT_COMPONENT gxvjust
/*
* referred `just' table format specification:
diff --git a/src/gxvalid/gxvkern.c b/src/gxvalid/gxvkern.c
index df9f10e..84eb366 100644
--- a/src/gxvalid/gxvkern.c
+++ b/src/gxvalid/gxvkern.c
@@ -39,7 +39,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvkern
+#define FT_COMPONENT gxvkern
/*************************************************************************/
diff --git a/src/gxvalid/gxvlcar.c b/src/gxvalid/gxvlcar.c
index fd167f6..d426a3a 100644
--- a/src/gxvalid/gxvlcar.c
+++ b/src/gxvalid/gxvlcar.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvlcar
+#define FT_COMPONENT gxvlcar
/*************************************************************************/
diff --git a/src/gxvalid/gxvmod.c b/src/gxvalid/gxvmod.c
index 847e0f1..24c1bc1 100644
--- a/src/gxvalid/gxvmod.c
+++ b/src/gxvalid/gxvmod.c
@@ -44,7 +44,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmodule
+#define FT_COMPONENT gxvmodule
static FT_Error
diff --git a/src/gxvalid/gxvmort.c b/src/gxvalid/gxvmort.c
index 1dfa5a3..2e94894 100644
--- a/src/gxvalid/gxvmort.c
+++ b/src/gxvalid/gxvmort.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmort
+#define FT_COMPONENT gxvmort
static void
diff --git a/src/gxvalid/gxvmort0.c b/src/gxvalid/gxvmort0.c
index c7901cb..6e905e7 100644
--- a/src/gxvalid/gxvmort0.c
+++ b/src/gxvalid/gxvmort0.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmort
+#define FT_COMPONENT gxvmort
static const char* GXV_Mort_IndicScript_Msg[] =
diff --git a/src/gxvalid/gxvmort1.c b/src/gxvalid/gxvmort1.c
index f2f4f57..1fade00 100644
--- a/src/gxvalid/gxvmort1.c
+++ b/src/gxvalid/gxvmort1.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmort
+#define FT_COMPONENT gxvmort
typedef struct GXV_mort_subtable_type1_StateOptRec_
diff --git a/src/gxvalid/gxvmort2.c b/src/gxvalid/gxvmort2.c
index 33fea0f..28dd264 100644
--- a/src/gxvalid/gxvmort2.c
+++ b/src/gxvalid/gxvmort2.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmort
+#define FT_COMPONENT gxvmort
typedef struct GXV_mort_subtable_type2_StateOptRec_
diff --git a/src/gxvalid/gxvmort4.c b/src/gxvalid/gxvmort4.c
index 6cf1e80..66737e6 100644
--- a/src/gxvalid/gxvmort4.c
+++ b/src/gxvalid/gxvmort4.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmort
+#define FT_COMPONENT gxvmort
static void
diff --git a/src/gxvalid/gxvmort5.c b/src/gxvalid/gxvmort5.c
index ae94e22..d169fa6 100644
--- a/src/gxvalid/gxvmort5.c
+++ b/src/gxvalid/gxvmort5.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmort
+#define FT_COMPONENT gxvmort
/*
diff --git a/src/gxvalid/gxvmorx.c b/src/gxvalid/gxvmorx.c
index f02ff54..be15f80 100644
--- a/src/gxvalid/gxvmorx.c
+++ b/src/gxvalid/gxvmorx.c
@@ -35,7 +35,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmorx
+#define FT_COMPONENT gxvmorx
static void
diff --git a/src/gxvalid/gxvmorx0.c b/src/gxvalid/gxvmorx0.c
index d65ced5..f3da055 100644
--- a/src/gxvalid/gxvmorx0.c
+++ b/src/gxvalid/gxvmorx0.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmorx
+#define FT_COMPONENT gxvmorx
static void
diff --git a/src/gxvalid/gxvmorx1.c b/src/gxvalid/gxvmorx1.c
index 1c8da1b..8fc7977 100644
--- a/src/gxvalid/gxvmorx1.c
+++ b/src/gxvalid/gxvmorx1.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmorx
+#define FT_COMPONENT gxvmorx
typedef struct GXV_morx_subtable_type1_StateOptRec_
diff --git a/src/gxvalid/gxvmorx2.c b/src/gxvalid/gxvmorx2.c
index d20fc57..1b7fb16 100644
--- a/src/gxvalid/gxvmorx2.c
+++ b/src/gxvalid/gxvmorx2.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmorx
+#define FT_COMPONENT gxvmorx
typedef struct GXV_morx_subtable_type2_StateOptRec_
diff --git a/src/gxvalid/gxvmorx4.c b/src/gxvalid/gxvmorx4.c
index fce219c..28ce5fc 100644
--- a/src/gxvalid/gxvmorx4.c
+++ b/src/gxvalid/gxvmorx4.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmorx
+#define FT_COMPONENT gxvmorx
FT_LOCAL_DEF( void )
diff --git a/src/gxvalid/gxvmorx5.c b/src/gxvalid/gxvmorx5.c
index 8826954..123da06 100644
--- a/src/gxvalid/gxvmorx5.c
+++ b/src/gxvalid/gxvmorx5.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvmorx
+#define FT_COMPONENT gxvmorx
/*
diff --git a/src/gxvalid/gxvopbd.c b/src/gxvalid/gxvopbd.c
index 76b6961..4e284fb 100644
--- a/src/gxvalid/gxvopbd.c
+++ b/src/gxvalid/gxvopbd.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvopbd
+#define FT_COMPONENT gxvopbd
/*************************************************************************/
diff --git a/src/gxvalid/gxvprop.c b/src/gxvalid/gxvprop.c
index 856dd10..6f8fb20 100644
--- a/src/gxvalid/gxvprop.c
+++ b/src/gxvalid/gxvprop.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvprop
+#define FT_COMPONENT gxvprop
/*************************************************************************/
diff --git a/src/gxvalid/gxvtrak.c b/src/gxvalid/gxvtrak.c
index d2ceb66..d0012db 100644
--- a/src/gxvalid/gxvtrak.c
+++ b/src/gxvalid/gxvtrak.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_gxvtrak
+#define FT_COMPONENT gxvtrak
/*************************************************************************/
diff --git a/src/otvalid/otvbase.c b/src/otvalid/otvbase.c
index 918e383..a212b95 100644
--- a/src/otvalid/otvbase.c
+++ b/src/otvalid/otvbase.c
@@ -27,7 +27,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_otvbase
+#define FT_COMPONENT otvbase
static void
diff --git a/src/otvalid/otvcommn.c b/src/otvalid/otvcommn.c
index 4a2c95e..ddfdb8a 100644
--- a/src/otvalid/otvcommn.c
+++ b/src/otvalid/otvcommn.c
@@ -26,7 +26,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_otvcommon
+#define FT_COMPONENT otvcommon
/*************************************************************************/
diff --git a/src/otvalid/otvgdef.c b/src/otvalid/otvgdef.c
index 68c00a5..1f324e9 100644
--- a/src/otvalid/otvgdef.c
+++ b/src/otvalid/otvgdef.c
@@ -27,7 +27,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_otvgdef
+#define FT_COMPONENT otvgdef
/*************************************************************************/
diff --git a/src/otvalid/otvgpos.c b/src/otvalid/otvgpos.c
index 17f2437..6ce6007 100644
--- a/src/otvalid/otvgpos.c
+++ b/src/otvalid/otvgpos.c
@@ -28,7 +28,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_otvgpos
+#define FT_COMPONENT otvgpos
static void
diff --git a/src/otvalid/otvgsub.c b/src/otvalid/otvgsub.c
index 0180b1a..18129ed 100644
--- a/src/otvalid/otvgsub.c
+++ b/src/otvalid/otvgsub.c
@@ -27,7 +27,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_otvgsub
+#define FT_COMPONENT otvgsub
/*************************************************************************/
diff --git a/src/otvalid/otvjstf.c b/src/otvalid/otvjstf.c
index 7a5769a..989754f 100644
--- a/src/otvalid/otvjstf.c
+++ b/src/otvalid/otvjstf.c
@@ -28,7 +28,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_otvjstf
+#define FT_COMPONENT otvjstf
#define JstfPriorityFunc otv_JstfPriority_validate
diff --git a/src/otvalid/otvmath.c b/src/otvalid/otvmath.c
index 4a9f3b0..c787133 100644
--- a/src/otvalid/otvmath.c
+++ b/src/otvalid/otvmath.c
@@ -30,7 +30,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_otvmath
+#define FT_COMPONENT otvmath
diff --git a/src/otvalid/otvmod.c b/src/otvalid/otvmod.c
index 5dd543b..5b53daa 100644
--- a/src/otvalid/otvmod.c
+++ b/src/otvalid/otvmod.c
@@ -35,7 +35,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_otvmodule
+#define FT_COMPONENT otvmodule
static FT_Error
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
index e2f7e7c..33d83d3 100644
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -45,7 +45,7 @@ THE SOFTWARE.
#include "pcfutil.h"
#undef FT_COMPONENT
-#define FT_COMPONENT trace_pcfread
+#define FT_COMPONENT pcfread
#include FT_SERVICE_BDF_H
#include FT_SERVICE_FONT_FORMAT_H
@@ -60,7 +60,7 @@ THE SOFTWARE.
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_pcfdriver
+#define FT_COMPONENT pcfdriver
/*
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index 14cce67..3aa6c0b 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -44,7 +44,7 @@ THE SOFTWARE.
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_pcfread
+#define FT_COMPONENT pcfread
#ifdef FT_DEBUG_LEVEL_TRACE
diff --git a/src/pfr/pfrgload.c b/src/pfr/pfrgload.c
index 06723ff..9818a2e 100644
--- a/src/pfr/pfrgload.c
+++ b/src/pfr/pfrgload.c
@@ -24,7 +24,7 @@
#include "pfrerror.h"
#undef FT_COMPONENT
-#define FT_COMPONENT trace_pfr
+#define FT_COMPONENT pfr
/*************************************************************************/
diff --git a/src/pfr/pfrload.c b/src/pfr/pfrload.c
index e9c0099..af2a037 100644
--- a/src/pfr/pfrload.c
+++ b/src/pfr/pfrload.c
@@ -23,7 +23,7 @@
#include "pfrerror.h"
#undef FT_COMPONENT
-#define FT_COMPONENT trace_pfr
+#define FT_COMPONENT pfr
/*
diff --git a/src/pfr/pfrobjs.c b/src/pfr/pfrobjs.c
index e51a842..c906c90 100644
--- a/src/pfr/pfrobjs.c
+++ b/src/pfr/pfrobjs.c
@@ -29,7 +29,7 @@
#include "pfrerror.h"
#undef FT_COMPONENT
-#define FT_COMPONENT trace_pfr
+#define FT_COMPONENT pfr
/*************************************************************************/
diff --git a/src/pfr/pfrsbit.c b/src/pfr/pfrsbit.c
index f5d3077..550c20d 100644
--- a/src/pfr/pfrsbit.c
+++ b/src/pfr/pfrsbit.c
@@ -24,7 +24,7 @@
#include "pfrerror.h"
#undef FT_COMPONENT
-#define FT_COMPONENT trace_pfr
+#define FT_COMPONENT pfr
/*************************************************************************/
diff --git a/src/psaux/cffdecode.c b/src/psaux/cffdecode.c
index af32f69..5732beb 100644
--- a/src/psaux/cffdecode.c
+++ b/src/psaux/cffdecode.c
@@ -35,7 +35,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cffdecode
+#define FT_COMPONENT cffdecode
#ifdef CFF_CONFIG_OPTION_OLD_ENGINE
diff --git a/src/psaux/psblues.c b/src/psaux/psblues.c
index e44f3c7..89738ce 100644
--- a/src/psaux/psblues.c
+++ b/src/psaux/psblues.c
@@ -51,7 +51,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cf2blues
+#define FT_COMPONENT cf2blues
/*
diff --git a/src/psaux/psconv.c b/src/psaux/psconv.c
index 74273f7..d0b6610 100644
--- a/src/psaux/psconv.c
+++ b/src/psaux/psconv.c
@@ -31,7 +31,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_psconv
+#define FT_COMPONENT psconv
/* The following array is used by various functions to quickly convert */
diff --git a/src/psaux/pshints.c b/src/psaux/pshints.c
index 0a5af31..1965b2c 100644
--- a/src/psaux/pshints.c
+++ b/src/psaux/pshints.c
@@ -52,7 +52,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cf2hints
+#define FT_COMPONENT cf2hints
typedef struct CF2_HintMoveRec_
diff --git a/src/psaux/psintrp.c b/src/psaux/psintrp.c
index 2597f8c..b63bcd4 100644
--- a/src/psaux/psintrp.c
+++ b/src/psaux/psintrp.c
@@ -59,7 +59,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_cf2interp
+#define FT_COMPONENT cf2interp
FT_LOCAL_DEF( void )
diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
index 36ee663..97c9cb1 100644
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_psobjs
+#define FT_COMPONENT psobjs
/*************************************************************************/
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index 6745603..f611cf9 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -38,7 +38,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1decode
+#define FT_COMPONENT t1decode
typedef enum T1_Operator_
diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c
index 925b3d6..63fd432 100644
--- a/src/pshinter/pshalgo.c
+++ b/src/pshinter/pshalgo.c
@@ -26,7 +26,7 @@
#undef FT_COMPONENT
-#define FT_COMPONENT trace_pshalgo
+#define FT_COMPONENT pshalgo
#ifdef DEBUG_HINTER
diff --git a/src/pshinter/pshrec.c b/src/pshinter/pshrec.c
index 50d66ca..5cece05 100644
--- a/src/pshinter/pshrec.c
+++ b/src/pshinter/pshrec.c
@@ -28,7 +28,7 @@
#include "pshnterr.h"
#undef FT_COMPONENT
-#define FT_COMPONENT trace_pshrec
+#define FT_COMPONENT pshrec
#ifdef DEBUG_HINTER
PS_Hints ps_debug_hints = NULL;
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c
index 8a583ea..5b47d15 100644
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -169,7 +169,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_raster
+#define FT_COMPONENT raster
#ifdef STANDALONE_
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index ae6d6cd..460fc9e 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -68,7 +68,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_sfdriver
+#define FT_COMPONENT sfdriver
/*
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 9dfc20e..a54335d 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -48,7 +48,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_sfobjs
+#define FT_COMPONENT sfobjs
diff --git a/src/sfnt/ttbdf.c b/src/sfnt/ttbdf.c
index a85a687..2a9f4d2 100644
--- a/src/sfnt/ttbdf.c
+++ b/src/sfnt/ttbdf.c
@@ -34,7 +34,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttbdf
+#define FT_COMPONENT ttbdf
FT_LOCAL_DEF( void )
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index a3a8c52..da9d865 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttcmap
+#define FT_COMPONENT ttcmap
#define TT_PEEK_SHORT FT_PEEK_SHORT
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index a8ff026..8b8263b 100644
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -77,7 +77,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttcolr
+#define FT_COMPONENT ttcolr
FT_LOCAL_DEF( FT_Error )
diff --git a/src/sfnt/ttcpal.c b/src/sfnt/ttcpal.c
index b4b60e2..b18f0aa 100644
--- a/src/sfnt/ttcpal.c
+++ b/src/sfnt/ttcpal.c
@@ -68,7 +68,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttcpal
+#define FT_COMPONENT ttcpal
FT_LOCAL_DEF( FT_Error )
diff --git a/src/sfnt/ttkern.c b/src/sfnt/ttkern.c
index 48ad417..02b614a 100644
--- a/src/sfnt/ttkern.c
+++ b/src/sfnt/ttkern.c
@@ -33,7 +33,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttkern
+#define FT_COMPONENT ttkern
#undef TT_KERN_INDEX
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index f3fed8f..a965bb2 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -33,7 +33,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttload
+#define FT_COMPONENT ttload
/**************************************************************************
diff --git a/src/sfnt/ttmtx.c b/src/sfnt/ttmtx.c
index 8edf4e6..6916486 100644
--- a/src/sfnt/ttmtx.c
+++ b/src/sfnt/ttmtx.c
@@ -45,7 +45,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttmtx
+#define FT_COMPONENT ttmtx
/**************************************************************************
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c
index 7148301..7d64a78 100644
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -45,7 +45,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttpost
+#define FT_COMPONENT ttpost
/* If this configuration macro is defined, we rely on the `PSNames' */
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index 209e8b0..0c3ecf6 100644
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -43,7 +43,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttsbit
+#define FT_COMPONENT ttsbit
FT_LOCAL_DEF( FT_Error )
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index 8f2a600..e40a30d 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -88,7 +88,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_smooth
+#define FT_COMPONENT smooth
#ifdef STANDALONE_
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index eac736c..a197d6c 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -51,7 +51,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttdriver
+#define FT_COMPONENT ttdriver
/*
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 9e98f11..0a436a2 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -45,7 +45,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttgload
+#define FT_COMPONENT ttgload
/**************************************************************************
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 3df50d6..fef0c8a 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -85,7 +85,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttgxvar
+#define FT_COMPONENT ttgxvar
/*************************************************************************/
diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c
index a86afb9..a8b9861 100644
--- a/src/truetype/ttinterp.c
+++ b/src/truetype/ttinterp.c
@@ -46,7 +46,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttinterp
+#define FT_COMPONENT ttinterp
#define NO_SUBPIXEL_HINTING \
diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c
index df6c72a..ff1ccec 100644
--- a/src/truetype/ttobjs.c
+++ b/src/truetype/ttobjs.c
@@ -43,7 +43,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttobjs
+#define FT_COMPONENT ttobjs
#ifdef TT_USE_BYTECODE_INTERPRETER
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c
index f7935cf..53b319e 100644
--- a/src/truetype/ttpload.c
+++ b/src/truetype/ttpload.c
@@ -38,7 +38,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_ttpload
+#define FT_COMPONENT ttpload
/**************************************************************************
diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c
index 0cbef3b..fc01daf 100644
--- a/src/type1/t1afm.c
+++ b/src/type1/t1afm.c
@@ -33,7 +33,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1afm
+#define FT_COMPONENT t1afm
FT_LOCAL_DEF( void )
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c
index 4d46e3e..3cde1dc 100644
--- a/src/type1/t1driver.c
+++ b/src/type1/t1driver.c
@@ -50,7 +50,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1driver
+#define FT_COMPONENT t1driver
/*
* GLYPH DICT SERVICE
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index 87c2a0f..e1b10dd 100644
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -36,7 +36,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1gload
+#define FT_COMPONENT t1gload
static FT_Error
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index a443571..b16389a 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -86,7 +86,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1load
+#define FT_COMPONENT t1load
#ifndef T1_CONFIG_OPTION_NO_MM_SUPPORT
diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c
index 05f02d5..6cc5ff9 100644
--- a/src/type1/t1objs.c
+++ b/src/type1/t1objs.c
@@ -43,7 +43,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1objs
+#define FT_COMPONENT t1objs
/**************************************************************************
diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c
index 9214831..145f616 100644
--- a/src/type1/t1parse.c
+++ b/src/type1/t1parse.c
@@ -50,7 +50,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t1parse
+#define FT_COMPONENT t1parse
/*************************************************************************/
diff --git a/src/type42/t42drivr.c b/src/type42/t42drivr.c
index 1036503..00b5fc7 100644
--- a/src/type42/t42drivr.c
+++ b/src/type42/t42drivr.c
@@ -47,7 +47,7 @@
#include FT_SERVICE_POSTSCRIPT_INFO_H
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t42
+#define FT_COMPONENT t42
/*
diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c
index 0325cad..0b265ce 100644
--- a/src/type42/t42objs.c
+++ b/src/type42/t42objs.c
@@ -25,7 +25,7 @@
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t42
+#define FT_COMPONENT t42
static FT_Error
diff --git a/src/type42/t42parse.c b/src/type42/t42parse.c
index 04690f5..71db217 100644
--- a/src/type42/t42parse.c
+++ b/src/type42/t42parse.c
@@ -30,7 +30,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_t42
+#define FT_COMPONENT t42
static void
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 70fc827..b2d76e7 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -37,7 +37,7 @@
* messages during execution.
*/
#undef FT_COMPONENT
-#define FT_COMPONENT trace_winfnt
+#define FT_COMPONENT winfnt
static const FT_Frame_Field winmz_header_fields[] =