[GNUnet-SVN] r34435 - in gnunet/src: include util

[gnunet]

Author: grothoff
Date: 2014-11-27 12:35:13 +0100 (Thu, 27 Nov 2014)
New Revision: 34435

Modified:
   gnunet/src/include/gnunet_mq_lib.h
   gnunet/src/util/mq.c
Log:
-return const, do not mangle const input

Modified: gnunet/src/include/gnunet_mq_lib.h
===================================================================
--- gnunet/src/include/gnunet_mq_lib.h  2014-11-27 10:31:36 UTC (rev 34434)
+++ gnunet/src/include/gnunet_mq_lib.h  2014-11-27 11:35:13 UTC (rev 34435)
@@ -105,8 +105,9 @@
  * @param base_size size of the message before the nested message's header 
appears
  * @return pointer to the nested message, does not copy the message
  */
-struct GNUNET_MessageHeader *
-GNUNET_MQ_extract_nested_mh_ (const struct GNUNET_MessageHeader *mh, uint16_t 
base_size);
+const struct GNUNET_MessageHeader *
+GNUNET_MQ_extract_nested_mh_ (const struct GNUNET_MessageHeader *mh,
+                              uint16_t base_size);
 
 
 /**

Modified: gnunet/src/util/mq.c
===================================================================
--- gnunet/src/util/mq.c        2014-11-27 10:31:36 UTC (rev 34434)
+++ gnunet/src/util/mq.c        2014-11-27 11:35:13 UTC (rev 34435)
@@ -809,36 +809,30 @@
 }
 
 
-struct GNUNET_MessageHeader *
+const struct GNUNET_MessageHeader *
 GNUNET_MQ_extract_nested_mh_ (const struct GNUNET_MessageHeader *mh,
                               uint16_t base_size)
 {
   uint16_t whole_size;
   uint16_t nested_size;
-  struct GNUNET_MessageHeader *nested_msg;
+  const struct GNUNET_MessageHeader *nested_msg;
 
   whole_size = ntohs (mh->size);
   GNUNET_assert (whole_size >= base_size);
-
   nested_size = whole_size - base_size;
-
   if (0 == nested_size)
     return NULL;
-
   if (nested_size < sizeof (struct GNUNET_MessageHeader))
   {
     GNUNET_break_op (0);
     return NULL;
   }
-
-  nested_msg = (struct GNUNET_MessageHeader *) ((char *) mh + base_size);
-
+  nested_msg = (const struct GNUNET_MessageHeader *) ((char *) mh + base_size);
   if (ntohs (nested_msg->size) != nested_size)
   {
     GNUNET_break_op (0);
-    nested_msg->size = htons (nested_size);
+    return NULL;
   }
-
   return nested_msg;
 }