summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2011-07-11 11:07:00 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2011-07-11 11:08:14 +0200
commita214b5227f872fc4e733b9a570ebc8973b244b0d (patch)
tree932bc7bc1100142fefec3bab0d3f1b27c8acb305 /src
parent415ba05bc6413695646b41120d149f7a53942001 (diff)
downloadcmumble-a214b5227f872fc4e733b9a570ebc8973b244b0d.tar.gz
cmumble-a214b5227f872fc4e733b9a570ebc8973b244b0d.tar.bz2
cmumble-a214b5227f872fc4e733b9a570ebc8973b244b0d.zip
Drop stringified parameter in MUMBLE_MSG macros
Use #foo instead to stringify.
Diffstat (limited to 'src')
-rw-r--r--src/cmumble.h2
-rwxr-xr-xsrc/gen_message.sh2
-rw-r--r--src/messages.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/cmumble.h b/src/cmumble.h
index baab8f3..f7db59c 100644
--- a/src/cmumble.h
+++ b/src/cmumble.h
@@ -56,7 +56,7 @@ enum udp_message_type {
};
enum mumble_message {
-#define MUMBLE_MSG(a,b,c) a,
+#define MUMBLE_MSG(a,b) a,
MUMBLE_MSGS
#undef MUMBLE_MSG
};
diff --git a/src/gen_message.sh b/src/gen_message.sh
index 32ef978..147e8a6 100755
--- a/src/gen_message.sh
+++ b/src/gen_message.sh
@@ -5,7 +5,7 @@ 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}, \"${message}\") \\"
+ echo -e "\tMUMBLE_MSG(${message}, ${prefixed_lower_name}) \\"
done
echo
echo "#endif"
diff --git a/src/messages.c b/src/messages.c
index a5f2f6f..512839b 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,c) { &mumble_proto_##b##__descriptor, c },
+#define MUMBLE_MSG(a,b) { &mumble_proto_##b##__descriptor, #a },
MUMBLE_MSGS
#undef MUMBLE_MSG
};