Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
protobuf-c
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
spbro
protobuf-c
Commits
ebeddac1
Commit
ebeddac1
authored
Feb 08, 2025
by
Robert Edmonds
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix indentation of MessageGenerator::GenerateMessageDescriptor()
parent
0edca93d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
159 additions
and
162 deletions
+159
-162
protoc-gen-c/c_message.cc
protoc-gen-c/c_message.cc
+159
-162
No files found.
protoc-gen-c/c_message.cc
View file @
ebeddac1
...
@@ -473,11 +473,11 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
...
@@ -473,11 +473,11 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
descriptor_
->
file
()
->
options
().
optimize_for
()
==
descriptor_
->
file
()
->
options
().
optimize_for
()
==
google
::
protobuf
::
FileOptions_OptimizeMode_CODE_SIZE
;
google
::
protobuf
::
FileOptions_OptimizeMode_CODE_SIZE
;
const
ProtobufCMessageOptions
opt
=
const
ProtobufCMessageOptions
opt
=
descriptor_
->
options
().
GetExtension
(
pb_c_msg
);
descriptor_
->
options
().
GetExtension
(
pb_c_msg
);
// Override parent settings, if needed
// Override parent settings, if needed
if
(
opt
.
has_gen_init_helpers
())
if
(
opt
.
has_gen_init_helpers
())
{
gen_init
=
opt
.
gen_init_helpers
();
gen_init
=
opt
.
gen_init_helpers
();
}
for
(
int
i
=
0
;
i
<
descriptor_
->
nested_type_count
();
i
++
)
{
for
(
int
i
=
0
;
i
<
descriptor_
->
nested_type_count
();
i
++
)
{
nested_generators_
[
i
]
->
GenerateMessageDescriptor
(
printer
,
gen_init
);
nested_generators_
[
i
]
->
GenerateMessageDescriptor
(
printer
,
gen_init
);
...
@@ -498,7 +498,6 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
...
@@ -498,7 +498,6 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
const
google
::
protobuf
::
FieldDescriptor
*
fd
=
descriptor_
->
field
(
i
);
const
google
::
protobuf
::
FieldDescriptor
*
fd
=
descriptor_
->
field
(
i
);
const
ProtobufCFieldOptions
opt
=
fd
->
options
().
GetExtension
(
pb_c_field
);
const
ProtobufCFieldOptions
opt
=
fd
->
options
().
GetExtension
(
pb_c_field
);
if
(
fd
->
has_default_value
())
{
if
(
fd
->
has_default_value
())
{
bool
already_defined
=
false
;
bool
already_defined
=
false
;
vars
[
"name"
]
=
fd
->
name
();
vars
[
"name"
]
=
fd
->
name
();
vars
[
"lcname"
]
=
CamelToLower
(
fd
->
name
());
vars
[
"lcname"
]
=
CamelToLower
(
fd
->
name
());
...
@@ -527,7 +526,6 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
...
@@ -527,7 +526,6 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
case
google
:
:
protobuf
::
FieldDescriptor
::
CPPTYPE_BOOL
:
case
google
:
:
protobuf
::
FieldDescriptor
::
CPPTYPE_BOOL
:
vars
[
"field_dv_ctype"
]
=
"protobuf_c_boolean"
;
vars
[
"field_dv_ctype"
]
=
"protobuf_c_boolean"
;
break
;
break
;
case
google
:
:
protobuf
::
FieldDescriptor
::
CPPTYPE_MESSAGE
:
case
google
:
:
protobuf
::
FieldDescriptor
::
CPPTYPE_MESSAGE
:
// NOTE: not supported by protobuf
// NOTE: not supported by protobuf
vars
[
"maybe_static"
]
=
""
;
vars
[
"maybe_static"
]
=
""
;
...
@@ -535,20 +533,17 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
...
@@ -535,20 +533,17 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
GOOGLE_LOG
(
FATAL
)
<<
"Messages can't have default values!"
;
GOOGLE_LOG
(
FATAL
)
<<
"Messages can't have default values!"
;
break
;
break
;
case
google
:
:
protobuf
::
FieldDescriptor
::
CPPTYPE_STRING
:
case
google
:
:
protobuf
::
FieldDescriptor
::
CPPTYPE_STRING
:
if
(
fd
->
type
()
==
google
::
protobuf
::
FieldDescriptor
::
TYPE_BYTES
||
opt
.
string_as_bytes
())
if
(
fd
->
type
()
==
google
::
protobuf
::
FieldDescriptor
::
TYPE_BYTES
||
opt
.
string_as_bytes
())
{
{
vars
[
"field_dv_ctype"
]
=
"ProtobufCBinaryData"
;
vars
[
"field_dv_ctype"
]
=
"ProtobufCBinaryData"
;
}
}
else
{
else
/* STRING type */
/* STRING type */
{
already_defined
=
true
;
already_defined
=
true
;
vars
[
"maybe_static"
]
=
""
;
vars
[
"maybe_static"
]
=
""
;
vars
[
"field_dv_ctype"
]
=
"char"
;
vars
[
"field_dv_ctype"
]
=
"char"
;
vars
[
"field_dv_ctype_suffix"
]
=
"[]"
;
vars
[
"field_dv_ctype_suffix"
]
=
"[]"
;
}
}
break
;
break
;
case
google
:
:
protobuf
::
FieldDescriptor
::
CPPTYPE_ENUM
:
case
google
:
:
protobuf
::
FieldDescriptor
::
CPPTYPE_ENUM
:
{
{
const
google
::
protobuf
::
EnumValueDescriptor
*
vd
=
fd
->
default_value_enum
();
const
google
::
protobuf
::
EnumValueDescriptor
*
vd
=
fd
->
default_value_enum
();
vars
[
"field_dv_ctype"
]
=
FullNameToC
(
vd
->
type
()
->
full_name
(),
vd
->
type
()
->
file
());
vars
[
"field_dv_ctype"
]
=
FullNameToC
(
vd
->
type
()
->
full_name
(),
vd
->
type
()
->
file
());
break
;
break
;
...
@@ -557,12 +552,13 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
...
@@ -557,12 +552,13 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
GOOGLE_LOG
(
FATAL
)
<<
"Unknown CPPTYPE"
;
GOOGLE_LOG
(
FATAL
)
<<
"Unknown CPPTYPE"
;
break
;
break
;
}
}
if
(
!
already_defined
)
if
(
!
already_defined
)
{
printer
->
Print
(
vars
,
"$maybe_static$const $field_dv_ctype$ $lcclassname$__$lcname$__default_value$field_dv_ctype_suffix$ = $default_value$;
\n
"
);
printer
->
Print
(
vars
,
"$maybe_static$const $field_dv_ctype$ $lcclassname$__$lcname$__default_value$field_dv_ctype_suffix$ = $default_value$;
\n
"
);
}
}
}
}
}
if
(
descriptor_
->
field_count
()
)
{
if
(
descriptor_
->
field_count
()
)
{
printer
->
Print
(
vars
,
printer
->
Print
(
vars
,
"static const ProtobufCFieldDescriptor $lcclassname$__field_descriptors[$n_fields$] =
\n
"
"static const ProtobufCFieldDescriptor $lcclassname$__field_descriptors[$n_fields$] =
\n
"
"{
\n
"
);
"{
\n
"
);
...
@@ -572,7 +568,8 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
...
@@ -572,7 +568,8 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
for
(
int
i
=
0
;
i
<
descriptor_
->
field_count
();
i
++
)
{
for
(
int
i
=
0
;
i
<
descriptor_
->
field_count
();
i
++
)
{
sorted_fields
.
push_back
(
descriptor_
->
field
(
i
));
sorted_fields
.
push_back
(
descriptor_
->
field
(
i
));
}
}
qsort
(
&
sorted_fields
[
0
],
sorted_fields
.
size
(),
qsort
(
&
sorted_fields
[
0
],
sorted_fields
.
size
(),
sizeof
(
const
google
::
protobuf
::
FieldDescriptor
*
),
sizeof
(
const
google
::
protobuf
::
FieldDescriptor
*
),
compare_pfields_by_number
);
compare_pfields_by_number
);
for
(
auto
field
:
sorted_fields
)
{
for
(
auto
field
:
sorted_fields
)
{
...
@@ -586,7 +583,9 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
...
@@ -586,7 +583,9 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
for
(
unsigned
i
=
0
;
i
<
descriptor_
->
field_count
();
i
++
)
{
for
(
unsigned
i
=
0
;
i
<
descriptor_
->
field_count
();
i
++
)
{
field_indices
.
push_back
({
.
index
=
i
,
.
name
=
sorted_fields
[
i
]
->
name
()
});
field_indices
.
push_back
({
.
index
=
i
,
.
name
=
sorted_fields
[
i
]
->
name
()
});
}
}
qsort
(
&
field_indices
[
0
],
field_indices
.
size
(),
sizeof
(
NameIndex
),
qsort
(
&
field_indices
[
0
],
field_indices
.
size
(),
sizeof
(
NameIndex
),
compare_name_indices_by_name
);
compare_name_indices_by_name
);
printer
->
Print
(
vars
,
"static const unsigned $lcclassname$__field_indices_by_name[] = {
\n
"
);
printer
->
Print
(
vars
,
"static const unsigned $lcclassname$__field_indices_by_name[] = {
\n
"
);
for
(
int
i
=
0
;
i
<
descriptor_
->
field_count
();
i
++
)
{
for
(
int
i
=
0
;
i
<
descriptor_
->
field_count
();
i
++
)
{
...
@@ -603,7 +602,8 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
...
@@ -603,7 +602,8 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
values
.
push_back
(
sorted_fields
[
i
]
->
number
());
values
.
push_back
(
sorted_fields
[
i
]
->
number
());
}
}
int
n_ranges
=
WriteIntRanges
(
printer
,
int
n_ranges
=
WriteIntRanges
(
printer
,
descriptor_
->
field_count
(),
&
values
[
0
],
descriptor_
->
field_count
(),
&
values
[
0
],
vars
[
"lcclassname"
]
+
"__number_ranges"
);
vars
[
"lcclassname"
]
+
"__number_ranges"
);
vars
[
"n_ranges"
]
=
SimpleItoa
(
n_ranges
);
vars
[
"n_ranges"
]
=
SimpleItoa
(
n_ranges
);
...
@@ -638,18 +638,15 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
...
@@ -638,18 +638,15 @@ GenerateMessageDescriptor(google::protobuf::io::Printer* printer, bool gen_init)
if
(
optimize_code_size
)
{
if
(
optimize_code_size
)
{
printer
->
Print
(
" NULL, /* CODE_SIZE */
\n
"
);
printer
->
Print
(
" NULL, /* CODE_SIZE */
\n
"
);
}
else
{
}
else
{
printer
->
Print
(
vars
,
printer
->
Print
(
vars
,
" $lcclassname$__field_indices_by_name,
\n
"
);
" $lcclassname$__field_indices_by_name,
\n
"
);
}
}
printer
->
Print
(
vars
,
printer
->
Print
(
vars
,
" $n_ranges$,"
" $n_ranges$,"
" $lcclassname$__number_ranges,
\n
"
);
" $lcclassname$__number_ranges,
\n
"
);
if
(
gen_init
)
{
if
(
gen_init
)
{
printer
->
Print
(
vars
,
printer
->
Print
(
vars
,
" (ProtobufCMessageInit) $lcclassname$__init,
\n
"
);
" (ProtobufCMessageInit) $lcclassname$__init,
\n
"
);
}
else
{
}
else
{
printer
->
Print
(
vars
,
printer
->
Print
(
vars
,
" NULL, /* gen_init_helpers = false */
\n
"
);
" NULL, /* gen_init_helpers = false */
\n
"
);
}
}
printer
->
Print
(
vars
,
printer
->
Print
(
vars
,
" NULL,NULL,NULL /* reserved[123] */
\n
"
" NULL,NULL,NULL /* reserved[123] */
\n
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment