diff options
| -rwxr-xr-x | src/gen_message.sh | 4 | ||||
| -rw-r--r-- | src/messages.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gen_message.sh b/src/gen_message.sh index 147e8a6..47b81e6 100755 --- a/src/gen_message.sh +++ b/src/gen_message.sh @@ -4,8 +4,8 @@ echo "#define _MESSAGES_H_" echo "#define MUMBLE_MSGS \\" while read message do - prefixed_lower_name=$(echo "$message" | sed "s/\(^\|[a-z]\)\([A-Z][A-Z]*\)/\1_\L\2/g") - echo -e "\tMUMBLE_MSG(${message}, ${prefixed_lower_name}) \\" + underscore_name=$(echo "$message" | sed -e "s/\([a-z]\)\([A-Z]\)/\1_\L\2/g" -e "s/[A-Z]*/\L\0/g") + echo -e "\tMUMBLE_MSG(${message}, ${underscore_name}) \\" done echo echo "#endif" diff --git a/src/messages.c b/src/messages.c index 512839b..2fd846e 100644 --- a/src/messages.c +++ b/src/messages.c @@ -8,7 +8,7 @@ static const struct { const ProtobufCMessageDescriptor *descriptor; const char *name; } messages[] = { -#define MUMBLE_MSG(a,b) { &mumble_proto_##b##__descriptor, #a }, +#define MUMBLE_MSG(a,b) { &mumble_proto__##b##__descriptor, #a }, MUMBLE_MSGS #undef MUMBLE_MSG }; |