Commit a39ed85f5600f5f8b15decb5d16931c91ed0a7a1
2012-04-05T11:24:39
Fix formatting in xkbcomp headers Signed-off-by: Ran Benita <ran234@gmail.com> [daniels: Fixed for xkb_desc -> xkb_keymap change.]
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
diff --git a/src/xkbcomp/action.c b/src/xkbcomp/action.c
index 25278b8..8476c8b 100644
--- a/src/xkbcomp/action.c
+++ b/src/xkbcomp/action.c
@@ -1065,12 +1065,9 @@ HandlePrivate(struct xkb_keymap * xkb,
return ReportIllegal(PrivateAction, field);
}
-typedef Bool(*actionHandler) (struct xkb_keymap * /* xkb */ ,
- struct xkb_any_action * /* action */ ,
- unsigned /* field */ ,
- ExprDef * /* array_ndx */ ,
- ExprDef * /* value */
- );
+typedef Bool (*actionHandler) (struct xkb_keymap *xkb,
+ struct xkb_any_action *action, unsigned field,
+ ExprDef *array_ndx, ExprDef *value);
static const actionHandler handleAction[XkbSA_NumActions + 1] = {
[XkbSA_NoAction] = HandleNoAction,
diff --git a/src/xkbcomp/action.h b/src/xkbcomp/action.h
index 5d4191c..137baf7 100644
--- a/src/xkbcomp/action.h
+++ b/src/xkbcomp/action.h
@@ -64,20 +64,14 @@ typedef struct _ActionInfo
struct _ActionInfo *next;
} ActionInfo;
-extern int HandleActionDef(ExprDef * /* def */ ,
- struct xkb_keymap * /* xkb */ ,
- struct xkb_any_action * /* action */ ,
- unsigned /* mergeMode */ ,
- ActionInfo * /* info */
- );
+extern int
+HandleActionDef(ExprDef *def, struct xkb_keymap *xkb,
+ struct xkb_any_action *action, unsigned mergeMode,
+ ActionInfo *info);
-extern int SetActionField(struct xkb_keymap * /* xkb */ ,
- char * /* elem */ ,
- char * /* field */ ,
- ExprDef * /* index */ ,
- ExprDef * /* value */ ,
- ActionInfo ** /* info_rtrn */
- );
+extern int
+SetActionField(struct xkb_keymap *xkb, char *elem, char *field,
+ ExprDef *index, ExprDef *value, ActionInfo **info_rtrn);
extern const LookupEntry ctrlNames[];
diff --git a/src/xkbcomp/alias.h b/src/xkbcomp/alias.h
index 9883852..53e70dd 100644
--- a/src/xkbcomp/alias.h
+++ b/src/xkbcomp/alias.h
@@ -34,22 +34,17 @@ typedef struct _AliasInfo
char real[XkbKeyNameLength + 1];
} AliasInfo;
-extern int HandleAliasDef(KeyAliasDef * /* def */ ,
- unsigned /* merge */ ,
- unsigned /* file_id */ ,
- AliasInfo ** /* info */
- );
-
-extern void ClearAliases(AliasInfo ** /* info */
- );
-
-extern Bool MergeAliases(AliasInfo ** /* into */ ,
- AliasInfo ** /* merge */ ,
- unsigned /* how_merge */
- );
-
-extern int ApplyAliases(struct xkb_keymap * /* xkb */ ,
- AliasInfo ** /* info */
- );
+extern int
+HandleAliasDef(KeyAliasDef *def, unsigned merge, unsigned file_id,
+ AliasInfo **info);
+
+extern void
+ClearAliases(AliasInfo **info);
+
+extern Bool
+MergeAliases(AliasInfo **into, AliasInfo **merge, unsigned how_merge);
+
+extern int
+ApplyAliases(struct xkb_keymap *xkb, AliasInfo **info);
#endif /* ALIAS_H */
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index a38d29e..b39d8ce 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -388,11 +388,8 @@ MergeIncludedCompatMaps(CompatInfo * into, CompatInfo * from, unsigned merge)
}
}
-typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
- struct xkb_keymap * /* xkb */ ,
- unsigned /* merge */ ,
- CompatInfo * /* info */
- );
+typedef void (*FileHandler) (XkbFile *rtrn, struct xkb_keymap *xkb,
+ unsigned merge, CompatInfo *info);
static Bool
HandleIncludeCompatMap(IncludeStmt * stmt,
diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index d147e89..048a348 100644
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -35,11 +35,8 @@
/***====================================================================***/
-typedef Bool(*IdentLookupFunc) (const void * /* priv */ ,
- xkb_atom_t /* field */ ,
- unsigned /* type */ ,
- ExprResult * /* val_rtrn */
- );
+typedef Bool (*IdentLookupFunc) (const void *priv, xkb_atom_t field,
+ unsigned type, ExprResult *val_rtrn);
/***====================================================================***/
diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h
index 7f15f90..02a2a93 100644
--- a/src/xkbcomp/expr.h
+++ b/src/xkbcomp/expr.h
@@ -35,11 +35,9 @@ typedef union _ExprResult
struct xkb_key_name keyName;
} ExprResult;
-extern int ExprResolveLhs(ExprDef * /* expr */ ,
- ExprResult * /* elem_rtrn */ ,
- ExprResult * /* field_rtrn */ ,
- ExprDef ** /* index_rtrn */
- );
+extern int
+ExprResolveLhs(ExprDef *expr, ExprResult *elem_rtrn, ExprResult *field_rtrn,
+ ExprDef **index_rtrn);
typedef struct _LookupEntry
{
@@ -48,84 +46,63 @@ typedef struct _LookupEntry
} LookupEntry;
-extern const char *exprOpText(unsigned /* type */
- );
-
-extern int LookupModMask(const void * /* priv */ ,
- xkb_atom_t /* field */ ,
- unsigned /* type */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int LookupVModMask(const void * /* priv */ ,
- xkb_atom_t /* field */ ,
- unsigned /* type */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int LookupModIndex(const void * /* priv */ ,
- xkb_atom_t /* field */ ,
- unsigned /* type */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int ExprResolveModMask(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int ExprResolveVModMask(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */ ,
- struct xkb_keymap * /* xkb */
- );
-
-extern int ExprResolveBoolean(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int ExprResolveKeyCode(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int ExprResolveInteger(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int ExprResolveLevel(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int ExprResolveGroup(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int ExprResolveButton(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int ExprResolveFloat(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int ExprResolveString(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int ExprResolveKeyName(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */
- );
-
-extern int ExprResolveEnum(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */ ,
- const LookupEntry * /* values */
- );
-
-extern int ExprResolveMask(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */ ,
- const LookupEntry * /* values */
- );
-
-extern int ExprResolveKeySym(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */
- );
+extern const char *
+exprOpText(unsigned type);
+
+extern int
+LookupModMask(const void *priv, xkb_atom_t field, unsigned type,
+ ExprResult *val_rtrn);
+
+extern int
+LookupVModMask(const void *priv, xkb_atom_t field, unsigned type,
+ ExprResult *val_rtrn);
+
+extern int
+LookupModIndex(const void *priv, xkb_atom_t field, unsigned type,
+ ExprResult *val_rtrn);
+
+extern int
+ExprResolveModMask(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveVModMask(ExprDef *expr, ExprResult *val_rtrn,
+ struct xkb_keymap *xkb);
+
+extern int
+ExprResolveBoolean(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveKeyCode(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveInteger(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveLevel(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveGroup(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveButton(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveFloat(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveString(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveKeyName(ExprDef *expr, ExprResult *val_rtrn);
+
+extern int
+ExprResolveEnum(ExprDef *expr, ExprResult *val_rtrn,
+ const LookupEntry *values);
+
+extern int
+ExprResolveMask(ExprDef *expr, ExprResult *val_rtrn,
+ const LookupEntry *values);
+
+extern int ExprResolveKeySym(ExprDef *expr, ExprResult *val_rtrn);
#endif /* EXPR_H */
diff --git a/src/xkbcomp/indicators.h b/src/xkbcomp/indicators.h
index 86e6295..f95f1a1 100644
--- a/src/xkbcomp/indicators.h
+++ b/src/xkbcomp/indicators.h
@@ -51,33 +51,27 @@ typedef struct _LEDInfo
unsigned int ctrls;
} LEDInfo;
-extern void ClearIndicatorMapInfo(LEDInfo * /* info */
- );
+extern void
+ClearIndicatorMapInfo(LEDInfo *info);
-extern LEDInfo *AddIndicatorMap(LEDInfo * /* oldLEDs */ ,
- LEDInfo * /* newLED */
- );
+extern LEDInfo *
+AddIndicatorMap(LEDInfo *oldLEDs, LEDInfo *newLED);
-extern int SetIndicatorMapField(LEDInfo * /* led */ ,
- struct xkb_keymap * /* xkb */ ,
- char * /* field */ ,
- ExprDef * /* arrayNdx */ ,
- ExprDef * /* value */
- );
+extern int
+SetIndicatorMapField(LEDInfo *led, struct xkb_keymap *xkb, char *field,
+ ExprDef *arrayNdx, ExprDef *value);
-extern LEDInfo *HandleIndicatorMapDef(IndicatorMapDef * /* stmt */ ,
- struct xkb_keymap * /* xkb */ ,
- LEDInfo * /* dflt */ ,
- LEDInfo * /* oldLEDs */ ,
- unsigned /* mergeMode */
- );
+extern LEDInfo *
+HandleIndicatorMapDef(IndicatorMapDef *stmt, struct xkb_keymap *xkb,
+ LEDInfo *dflt, LEDInfo *oldLEDs, unsigned mergeMode);
extern Bool
-CopyIndicatorMapDefs(struct xkb_keymap * xkb, LEDInfo *leds, LEDInfo **unboundRtrn);
+CopyIndicatorMapDefs(struct xkb_keymap *xkb, LEDInfo *leds,
+ LEDInfo **unboundRtrn);
extern Bool
-BindIndicators(struct xkb_keymap * xkb, Bool force, LEDInfo *unbound,
+BindIndicators(struct xkb_keymap *xkb, Bool force, LEDInfo *unbound,
LEDInfo **unboundRtrn);
#endif /* INDICATORS_H */
diff --git a/src/xkbcomp/keycodes.h b/src/xkbcomp/keycodes.h
index c64b082..7f8b567 100644
--- a/src/xkbcomp/keycodes.h
+++ b/src/xkbcomp/keycodes.h
@@ -27,13 +27,16 @@
#ifndef KEYCODES_H
#define KEYCODES_H 1
-#define KeyNameToLong(n) ((((unsigned long)n[0])<<24)|(((unsigned long)n[1])<<16)|(((unsigned long)n[2])<<8)|n[3])
+#define KeyNameToLong(n) ( \
+ (((unsigned long)n[0]) << 24) | \
+ (((unsigned long)n[1]) << 16) | \
+ (((unsigned long)n[2]) << 8) | \
+ (((unsigned long)n[3]) << 0))
-extern const char *longText(unsigned long /* val */
- );
+extern const
+char *longText(unsigned long val);
-extern void LongToKeyName(unsigned long /* val */ ,
- char * /* name_rtrn */
- );
+extern void
+LongToKeyName(unsigned long val, char *name_rtrn);
#endif /* KEYCODES_H */
diff --git a/src/xkbcomp/keytypes.c b/src/xkbcomp/keytypes.c
index ddf174c..ae0c15a 100644
--- a/src/xkbcomp/keytypes.c
+++ b/src/xkbcomp/keytypes.c
@@ -356,11 +356,8 @@ MergeIncludedKeyTypes(KeyTypesInfo * into,
into->stdPresent |= from->stdPresent;
}
-typedef void (*FileHandler) (XkbFile * /* file */ ,
- struct xkb_keymap * /* xkb */ ,
- unsigned /* merge */ ,
- KeyTypesInfo * /* included */
- );
+typedef void (*FileHandler) (XkbFile *file, struct xkb_keymap *xkb,
+ unsigned merge, KeyTypesInfo *included);
static Bool
HandleIncludeKeyTypes(IncludeStmt * stmt,
diff --git a/src/xkbcomp/misc.h b/src/xkbcomp/misc.h
index 01fb416..11753f0 100644
--- a/src/xkbcomp/misc.h
+++ b/src/xkbcomp/misc.h
@@ -35,58 +35,40 @@ typedef struct _CommonInfo
struct _CommonInfo *next;
} CommonInfo;
-extern Bool UseNewField(unsigned /* field */ ,
- CommonInfo * /* oldDefs */ ,
- CommonInfo * /* newDefs */ ,
- unsigned * /* pCollide */
- );
-
-extern char * ClearCommonInfo(CommonInfo * /* cmn */
- );
-
-extern char * AddCommonInfo(CommonInfo * /* old */ ,
- CommonInfo * /* new */
- );
-
-extern int ReportNotArray(const char * /* type */ ,
- const char * /* field */ ,
- const char * /* name */
- );
-
-extern int ReportShouldBeArray(const char * /* type */ ,
- const char * /* field */ ,
- const char * /* name */
- );
-
-extern int ReportBadType(const char * /* type */ ,
- const char * /* field */ ,
- const char * /* name */ ,
- const char * /* wanted */
- );
-
-extern int ReportBadField(const char * /* type */ ,
- const char * /* field */ ,
- const char * /* name */
- );
-
-extern Bool ProcessIncludeFile(struct xkb_context * /* context */,
- IncludeStmt * /* stmt */ ,
- unsigned /* file_type */ ,
- XkbFile ** /* file_rtrn */ ,
- unsigned * /* merge_rtrn */
- );
-
-extern Bool FindNamedKey(struct xkb_keymap * /* xkb */ ,
- unsigned long /* name */ ,
- xkb_keycode_t * /* kc_rtrn */ ,
- Bool /* use_aliases */ ,
- Bool /* create */ ,
- xkb_keycode_t /* start_from */
- );
-
-extern Bool FindKeyNameForAlias(struct xkb_keymap * /* xkb */ ,
- unsigned long /* lname */ ,
- unsigned long * /* real_name */
- );
+extern Bool
+UseNewField(unsigned field, CommonInfo *oldDefs, CommonInfo *newDefs,
+ unsigned *pCollide);
+
+extern char *
+ClearCommonInfo(CommonInfo *cmn);
+
+extern char *
+AddCommonInfo(CommonInfo *old, CommonInfo *new);
+
+extern int
+ReportNotArray(const char *type, const char *field, const char *name);
+
+extern int
+ReportShouldBeArray(const char *type, const char *field, const char *name);
+
+extern int
+ReportBadType(const char *type, const char *field, const char *name,
+ const char *wanted);
+
+extern int
+ReportBadField(const char *type, const char *field, const char *name);
+
+extern Bool
+ProcessIncludeFile(struct xkb_context *context,
+ IncludeStmt *stmt, unsigned file_type, XkbFile **file_rtrn,
+ unsigned *merge_rtrn);
+
+extern Bool
+FindNamedKey(struct xkb_keymap *xkb, unsigned long name, xkb_keycode_t *kc_rtrn,
+ Bool use_aliases, Bool create, xkb_keycode_t start_from);
+
+extern Bool
+FindKeyNameForAlias(struct xkb_keymap *xkb, unsigned long lname,
+ unsigned long *real_name);
#endif /* MISC_H */
diff --git a/src/xkbcomp/parseutils.h b/src/xkbcomp/parseutils.h
index 82cd0fc..87b1620 100644
--- a/src/xkbcomp/parseutils.h
+++ b/src/xkbcomp/parseutils.h
@@ -41,131 +41,102 @@ struct scanner_extra {
char *s;
};
-extern ParseCommon *AppendStmt(ParseCommon * /* to */ ,
- ParseCommon * /* append */
- );
+extern ParseCommon *
+AppendStmt(ParseCommon *to, ParseCommon *append);
-extern ExprDef *ExprCreate(unsigned /* op */ ,
- unsigned /* type */
- );
+extern ExprDef *
+ExprCreate(unsigned op, unsigned type);
-extern ExprDef *ExprCreateUnary(unsigned /* op */ ,
- unsigned /* type */ ,
- ExprDef * /* child */
- );
+extern ExprDef *
+ExprCreateUnary(unsigned op, unsigned type, ExprDef *child);
-extern ExprDef *ExprCreateBinary(unsigned /* op */ ,
- ExprDef * /* left */ ,
- ExprDef * /* right */
- );
+extern ExprDef *
+ExprCreateBinary(unsigned op, ExprDef *left, ExprDef *right);
-extern KeycodeDef *KeycodeCreate(const char * /* name */ ,
- unsigned long /* value */
- );
+extern KeycodeDef *
+KeycodeCreate(const char *name, unsigned long value);
-extern KeyAliasDef *KeyAliasCreate(const char * /* alias */ ,
- const char * /* real */
- );
+extern KeyAliasDef *
+KeyAliasCreate(const char *alias, const char *real);
-extern VModDef *VModCreate(xkb_atom_t /* name */ ,
- ExprDef * /* value */
- );
+extern VModDef *
+VModCreate(xkb_atom_t name, ExprDef *value);
-extern VarDef *VarCreate(ExprDef * /* name */ ,
- ExprDef * /* value */
- );
+extern VarDef *
+VarCreate(ExprDef *name, ExprDef *value);
-extern VarDef *BoolVarCreate(xkb_atom_t /* nameToken */ ,
- unsigned /* set */
- );
+extern VarDef *
+BoolVarCreate(xkb_atom_t nameToken, unsigned set);
-extern InterpDef *InterpCreate(char * /* sym */ ,
- ExprDef * /* match */
- );
+extern InterpDef *
+InterpCreate(char *sym, ExprDef *match);
-extern KeyTypeDef *KeyTypeCreate(xkb_atom_t /* name */ ,
- VarDef * /* body */
- );
+extern KeyTypeDef *
+KeyTypeCreate(xkb_atom_t name, VarDef *body);
-extern SymbolsDef *SymbolsCreate(const char * /* keyName */ ,
- ExprDef * /* symbols */
- );
+extern SymbolsDef *
+SymbolsCreate(const char *keyName, ExprDef *symbols);
-extern GroupCompatDef *GroupCompatCreate(int /* group */ ,
- ExprDef * /* def */
- );
+extern GroupCompatDef *
+GroupCompatCreate(int group, ExprDef *def);
-extern ModMapDef *ModMapCreate(uint32_t /* modifier */ ,
- ExprDef * /* keys */
- );
+extern ModMapDef *
+ModMapCreate(uint32_t modifier, ExprDef *keys);
-extern IndicatorMapDef *IndicatorMapCreate(xkb_atom_t /* name */ ,
- VarDef * /* body */
- );
+extern IndicatorMapDef *
+IndicatorMapCreate(xkb_atom_t name, VarDef *body);
-extern IndicatorNameDef *IndicatorNameCreate(int /* ndx */ ,
- ExprDef * /* name */ ,
- Bool /* virtual */
- );
+extern IndicatorNameDef *
+IndicatorNameCreate(int ndx, ExprDef *name, Bool virtual);
-extern ExprDef *ActionCreate(xkb_atom_t /* name */ ,
- ExprDef * /* args */
- );
+extern ExprDef *
+ActionCreate(xkb_atom_t name, ExprDef *args);
-extern ExprDef *CreateMultiKeysymList(ExprDef * /* list */
- );
+extern ExprDef *
+CreateMultiKeysymList(ExprDef *list);
-extern ExprDef *CreateKeysymList(char * /* sym */
- );
+extern ExprDef *
+CreateKeysymList(char *sym);
-extern ExprDef *AppendMultiKeysymList(ExprDef * /* list */ ,
- ExprDef * /* append */
- );
+extern ExprDef *
+AppendMultiKeysymList(ExprDef *list, ExprDef *append);
-extern ExprDef *AppendKeysymList(ExprDef * /* list */ ,
- char * /* sym */
- );
+extern ExprDef *
+AppendKeysymList(ExprDef *list, char *sym);
-extern int LookupKeysym(const char * /* str */ ,
- xkb_keysym_t * /* sym_rtrn */
- );
+extern int
+LookupKeysym(const char *str, xkb_keysym_t *sym_rtrn);
-extern IncludeStmt *IncludeCreate(char * /* str */ ,
- unsigned /* merge */
- );
+extern IncludeStmt *
+IncludeCreate(char *str, unsigned merge);
-extern unsigned StmtSetMerge(ParseCommon * /* stmt */ ,
- unsigned /* merge */,
- YYLTYPE * /* loc */,
- void * /* scanner */
- );
+extern unsigned
+StmtSetMerge(ParseCommon *stmt, unsigned merge, YYLTYPE *loc, void *scanner);
#ifdef DEBUG
-extern void PrintStmtAddrs(ParseCommon * /* stmt */
- );
+extern void
+PrintStmtAddrs(ParseCommon *stmt);
#endif
-extern int XKBParseFile(FILE * /* file */ ,
- const char * /* fileName */,
- XkbFile ** /* pRtrn */
- );
+extern void
+CheckDefaultMap(XkbFile *maps, const char *fileName);
-extern int XKBParseString(const char *string, const char *fileName,
- XkbFile ** pRtrn);
+extern int
+XKBParseFile(FILE *file, const char *fileName, XkbFile **pRtrn);
-extern void CheckDefaultMap(XkbFile * maps, const char *fileName);
+extern int
+XKBParseString(const char *string, const char *fileName, XkbFile **pRtrn);
-extern XkbFile *CreateXKBFile(int /* type */ ,
- char * /* name */ ,
- ParseCommon * /* defs */ ,
- unsigned /* flags */
- );
+extern XkbFile *
+CreateXKBFile(int type, char *name, ParseCommon *defs, unsigned flags);
-extern void FreeXKBFile(XkbFile *file);
+extern void
+FreeXKBFile(XkbFile *file);
-extern void FreeStmt(ParseCommon * /* stmt */
- );
+extern void
+FreeStmt(ParseCommon *stmt);
-extern void yyerror(struct YYLTYPE *loc, void *scanner, const char *msg);
+extern void
+yyerror(struct YYLTYPE *loc, void *scanner, const char *msg);
#endif /* XKBPARSE_H */
diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index 8762720..ea4b092 100644
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -876,11 +876,8 @@ MergeIncludedSymbols(SymbolsInfo * into, SymbolsInfo * from,
into->errorCount++;
}
-typedef void (*FileHandler) (XkbFile * /* rtrn */ ,
- struct xkb_keymap * /* xkb */ ,
- unsigned /* merge */ ,
- SymbolsInfo * /* included */
- );
+typedef void (*FileHandler) (XkbFile *rtrn, struct xkb_keymap *xkb,
+ unsigned merge, SymbolsInfo *included);
static Bool
HandleIncludeSymbols(IncludeStmt * stmt,
diff --git a/src/xkbcomp/vmod.h b/src/xkbcomp/vmod.h
index d89c680..9463f6d 100644
--- a/src/xkbcomp/vmod.h
+++ b/src/xkbcomp/vmod.h
@@ -29,38 +29,31 @@
typedef struct _VModInfo
{
- struct xkb_keymap * xkb;
+ struct xkb_keymap *xkb;
unsigned defined;
unsigned available;
unsigned newlyDefined;
int errorCount;
} VModInfo;
-extern void InitVModInfo(VModInfo * /* info */ ,
- struct xkb_keymap * /* xkb */
- );
+extern void
+InitVModInfo(VModInfo *info, struct xkb_keymap *xkb);
-extern void ClearVModInfo(VModInfo * /* info */ ,
- struct xkb_keymap * /* xkb */
- );
+extern void
+ClearVModInfo(VModInfo *info, struct xkb_keymap *xkb);
-extern Bool HandleVModDef(VModDef * /* stmt */ ,
- struct xkb_keymap * /* xkb */ ,
- unsigned /* mergeMode */ ,
- VModInfo * /* info */
- );
+extern Bool
+HandleVModDef(VModDef *stmt, struct xkb_keymap *xkb, unsigned mergeMode,
+ VModInfo *info);
-extern Bool ApplyVModDefs(VModInfo * /* info */ ,
- struct xkb_keymap * /* xkb */
- );
+extern Bool
+ApplyVModDefs(VModInfo *info, struct xkb_keymap *xkb);
-extern int FindKeypadVMod(struct xkb_keymap * /* xkb */
- );
+extern int
+FindKeypadVMod(struct xkb_keymap *xkb);
-extern Bool ResolveVirtualModifier(ExprDef * /* def */ ,
- struct xkb_keymap * /* xkb */ ,
- ExprResult * /* value_rtrn */ ,
- VModInfo * /* info */
- );
+extern Bool
+ResolveVirtualModifier(ExprDef *def, struct xkb_keymap *xkb,
+ ExprResult *value_rtrn, VModInfo *info);
#endif /* VMOD_H */
diff --git a/src/xkbcomp/xkbpath.h b/src/xkbcomp/xkbpath.h
index e48cf41..8fe5571 100644
--- a/src/xkbcomp/xkbpath.h
+++ b/src/xkbcomp/xkbpath.h
@@ -31,20 +31,15 @@
#include "XKBcommonint.h"
-extern const char *XkbDirectoryForInclude(unsigned /* type */
- );
-
-extern FILE *XkbFindFileInPath(struct xkb_context * /* context */,
- const char * /* name */ ,
- unsigned /* type */ ,
- char ** /* pathRtrn */
- );
-
-extern Bool XkbParseIncludeMap(char ** /* str_inout */ ,
- char ** /* file_rtrn */ ,
- char ** /* map_rtrn */ ,
- char * /* nextop_rtrn */ ,
- char ** /* extra_data */
- );
+extern const char *
+XkbDirectoryForInclude(unsigned type);
+
+extern FILE *
+XkbFindFileInPath(struct xkb_context *context, const char *name,
+ unsigned type, char **pathRtrn);
+
+extern Bool
+XkbParseIncludeMap(char **str_inout, char **file_rtrn, char **map_rtrn,
+ char *nextop_rtrn, char **extra_data);
#endif /* _XKBPATH_H_ */