initialize the enum values; padding not strictly required

diff --git a/org.glite.lb.client-interface/interface/events.h.T b/org.glite.lb.client-interface/interface/events.h.T
index 4b6326d..c0cccd2 100644 (file)
--- a/org.glite.lb.client-interface/interface/events.h.T
+++ b/org.glite.lb.client-interface/interface/events.h.T
@@ -88,9 +88,10 @@ extern char *edg_wll_EventToString(edg_wll_EventCode event);
  * Predefined ULM key types
  */
 typedef enum _edg_wll_KeyNameCode {
-       UNDEFINED,              /**< undefined */
-       EDG_WLL_EVNT,           /**< event type */
+       UNDEFINED = 0,          /**< undefined */
+       EDG_WLL_EVNT = 1,               /**< event type */
 @@@{
+my $keyno = 2;
 selectType $event '_common_';
 for ($event->getFieldsOrdered) {
        my $f = selectField $event $_;
@@ -98,10 +99,11 @@ for ($event->getFieldsOrdered) {
        my $fnu = uc $fn;
        my $c = $f->{comment};
        if (hasAlias $f 'ULM') {
-               gen "\tULM\_$fnu,\t\t/**< $c */\n";
+               gen "\tULM\_$fnu = $keyno,\t\t/**< $c */\n";
        } else {
-               gen "\tEDG_WLL\_COMMON\_$fnu,\t\t/**< $c */\n";
+               gen "\tEDG_WLL\_COMMON\_$fnu = $keyno,\t\t/**< $c */\n";
        }
+       $keyno++;
 }
 for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
                $event->getTypes) {
@@ -111,7 +113,8 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
                my $f = selectField $event $_;
                my $fnu = uc $f->{name};
                my $c = $f->{comment};
-               gen "\tEDG_WLL\_$tu\_$fnu,\t/**< $c */\n";
+               gen "\tEDG_WLL\_$tu\_$fnu = $keyno,\t/**< $c */\n";
+               $keyno++;
        }
 }
 @@@}

diff --git a/org.glite.lb.common/src/events.c.T b/org.glite.lb.common/src/events.c.T
index 9ce4022..7916339 100644 (file)
--- a/org.glite.lb.common/src/events.c.T
+++ b/org.glite.lb.common/src/events.c.T
@@ -87,6 +87,7 @@ static const char *keyNames[] = {
        "Undefined",
        "DG.EVNT",
 @@@{
+my $keyno = 2;
 selectType $event '_common_';
 for ($event->getFieldsOrdered) {
        my $f = selectField $event $_;
@@ -94,10 +95,11 @@ for ($event->getFieldsOrdered) {
        my $fnu = uc $fn;
        my $c = $f->{comment};
        if (hasAlias $f 'ULM') {
-               gen "\t\"$fnu\",\n";
+               gen "\t\"$fnu\",  /* $keyno */\n";
        } else {
-               gen "\t\"DG.$fnu\",\n";
+               gen "\t\"DG.$fnu\", /* $keyno */\n";
        }
+       $keyno++;
 }
 for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
                $event->getTypes) {
@@ -106,7 +108,8 @@ for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
        for ($event->getFieldsOrdered) {
                my $f = selectField $event $_;
                my $fnu = uc $f->{name};
-               gen "\t\"DG.$tu.$fnu\",\n";
+               gen "\t\"DG.$tu.$fnu\", /* $keyno */\n";
+               $keyno++;
        }
 }
 @@@}