fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-01 04:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

docs: fix handling enums without explicit numeric value in "tools/enums-to-docbook.pl"

Browse source 
Previously, an enum that didn't explicitly specify a numeric value
would wrongly start counting at 1.

E.g.

  typedef enum {
     MY_VAL,
  } Name;

would result in documentation with MY_VAL=1.

https://bugzilla.gnome.org/show_bug.cgi?id=776848
(cherry picked from commit 36ec46e8f8)
(cherry picked from commit 26f0d68e82)
This commit is contained in:
Thomas Haller 2017-01-04 09:30:38 +01:00
parent e4d263f1db
commit 70d14820e6
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/enums-to-docbook.pl
View file

@ -62,8 +62,11 @@ sub inc
{
my $val = shift;
if ($val =~ /^\d+$/) {
if ($val =~ /^-?\d+$/) {
my $len = length $val;
if ($val =~ /^-/ && ($val + 1 == 0)) {
$len = $len - 1
}
return sprintf "%0${len}d", $val + 1;
} elsif ($val =~ /^0x(.+)$/) {
my $len = length $1;
@ -117,7 +120,7 @@ if (/^\/\*\*$/) {
$choice = undef;
} elsif (/^typedef enum/) {
# Start of an enum
$val = 0;
$val = -1;
} elsif (/^\s+(\S+)\s+=\s+([^,\s]+)/) {
# A choice with a literal value
next unless @choices;