[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 01/02: improve types, eliminate compiler warning f
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 01/02: improve types, eliminate compiler warning for unused function |
Date: |
Sun, 25 Dec 2016 00:36:12 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit 96b233995e41e0b6be65734ec5f29108ee017d31
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Dec 23 22:37:31 2016 +0100
improve types, eliminate compiler warning for unused function
---
src/nat/nat_api_stun.c | 4 +---
src/nat/nat_stun.h | 21 ++++++++++++---------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/nat/nat_api_stun.c b/src/nat/nat_api_stun.c
index 8f5a5f8..7f2ef4e 100644
--- a/src/nat/nat_api_stun.c
+++ b/src/nat/nat_api_stun.c
@@ -199,9 +199,7 @@ stun_dns_callback (void *cls,
/**
* Make Generic STUN request. Sends a generic stun request to the
- * server specified using the specified socket, possibly waiting for
- * a reply and filling the 'reply' field with the externally visible
- * address.
+ * server specified using the specified socket.
*
* @param server the address of the stun server
* @param port port of the stun server, in host byte order
diff --git a/src/nat/nat_stun.h b/src/nat/nat_stun.h
index 4c6c178..3e42288 100644
--- a/src/nat/nat_stun.h
+++ b/src/nat/nat_stun.h
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- Copyright (C) 2009, 2015 GNUnet e.V.
+ Copyright (C) 2009, 2015, 2016 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -135,23 +135,24 @@ enum StunAttributes {
* @param msg the received message
* @return the converted StunClass
*/
-static int
-decode_class(int msg)
+static enum StunClasses
+decode_class (int msg)
{
/* Sorry for the magic, but this maps the class according to rfc5245 */
- return ((msg & 0x0010) >> 4) | ((msg & 0x0100) >> 7);
+ return (enum StunClasses) ((msg & 0x0010) >> 4) | ((msg & 0x0100) >> 7);
}
+
/**
* Convert a message to a StunMethod
*
* @param msg the received message
* @return the converted StunMethod
*/
-static int
-decode_method(int msg)
+static enum StunMethods
+decode_method (int msg)
{
- return (msg & 0x000f) | ((msg & 0x00e0) >> 1) | ((msg & 0x3e00) >> 2);
+ return (enum StunMethods) (msg & 0x000f) | ((msg & 0x00e0) >> 1) | ((msg &
0x3e00) >> 2);
}
@@ -161,6 +162,7 @@ decode_method(int msg)
* @param msg
* @return string with the message class and method
*/
+GNUNET_UNUSED
static const char *
stun_msg2str (int msg)
{
@@ -172,14 +174,14 @@ stun_msg2str (int msg)
{ STUN_INDICATION, "Indication" },
{ STUN_RESPONSE, "Response" },
{ STUN_ERROR_RESPONSE, "Error Response" },
- { 0, NULL }
+ { INVALID_CLASS, NULL }
};
static const struct {
enum StunMethods value;
const char *name;
} methods[] = {
{ STUN_BINDING, "Binding" },
- { 0, NULL }
+ { INVALID_METHOD, NULL }
};
static char result[64];
const char *msg_class = NULL;
@@ -215,6 +217,7 @@ stun_msg2str (int msg)
* @param msg with a attribute type
* @return string with the attribute name
*/
+GNUNET_UNUSED
static const char *
stun_attr2str (enum StunAttributes msg)
{
--
To stop receiving notification emails like this one, please contact
address@hidden