Change const to __const and add nonnull attributes.

1 files changed, 18 insertions, 13 deletions

diff --git a/rt/mqueue.h b/rt/mqueue.h
index 1ccad5bbad..d8c5e43f64 100644
--- a/rt/mqueue.h
+++ b/rt/mqueue.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -38,37 +38,40 @@ __BEGIN_DECLS
    argument is taken as `struct mq_attr *', pointer to message queue
    attributes.  If the fourth argument is NULL, default attributes are
    used.  */
-extern mqd_t mq_open (const char *__name, int __oflag, ...) __THROW;
+extern mqd_t mq_open (__const char *__name, int __oflag, ...)
+  __THROW __nonnull ((1));
 
 /* Removes the association between message queue descriptor MQDES and its
    message queue.  */
 extern int mq_close (mqd_t __mqdes) __THROW;
 
 /* Query status and attributes of message queue MQDES.  */
-extern int mq_getattr (mqd_t __mqdes, struct mq_attr *__mqstat) __THROW;
+extern int mq_getattr (mqd_t __mqdes, struct mq_attr *__mqstat)
+  __THROW __nonnull ((2));
 
 /* Set attributes associated with message queue MQDES and if OMQSTAT is
    not NULL also query its old attributes.  */
 extern int mq_setattr (mqd_t __mqdes,
-		       const struct mq_attr *__restrict __mqstat,
-		       struct mq_attr *__restrict __omqstat) __THROW;
+		       __const struct mq_attr *__restrict __mqstat,
+		       struct mq_attr *__restrict __omqstat)
+  __THROW __nonnull ((2));
 
 /* Remove message queue named NAME.  */
-extern int mq_unlink (const char *__name) __THROW;
+extern int mq_unlink (__const char *__name) __THROW __nonnull ((1));
 
 /* Register notification issued upon message arrival to an empty
    message queue MQDES.  */
-extern int mq_notify (mqd_t __mqdes, const struct sigevent *__notification)
+extern int mq_notify (mqd_t __mqdes, __const struct sigevent *__notification)
      __THROW;
 
 /* Receive the oldest from highest priority messages in message queue
    MQDES.  */
 extern ssize_t mq_receive (mqd_t __mqdes, char *__msg_ptr, size_t __msg_len,
-			   unsigned int *__msg_prio);
+			   unsigned int *__msg_prio) __nonnull ((2));
 
 /* Add message pointed by MSG_PTR to message queue MQDES.  */
-extern int mq_send (mqd_t __mqdes, const char *__msg_ptr, size_t __msg_len,
-		    unsigned int __msg_prio);
+extern int mq_send (mqd_t __mqdes, __const char *__msg_ptr, size_t __msg_len,
+		    unsigned int __msg_prio) __nonnull ((2));
 
 #ifdef __USE_XOPEN2K
 /* Receive the oldest from highest priority messages in message queue
@@ -76,13 +79,15 @@ extern int mq_send (mqd_t __mqdes, const char *__msg_ptr, size_t __msg_len,
 extern ssize_t mq_timedreceive (mqd_t __mqdes, char *__restrict __msg_ptr,
 				size_t __msg_len,
 				unsigned int *__restrict __msg_prio,
-				const struct timespec *__restrict __abs_timeout);
+				__const struct timespec *__restrict __abs_timeout)
+  __nonnull ((1, 4));
 
 /* Add message pointed by MSG_PTR to message queue MQDES, stop blocking
    on full message queue if ABS_TIMEOUT expires.  */
-extern int mq_timedsend (mqd_t __mqdes, const char *__msg_ptr,
+extern int mq_timedsend (mqd_t __mqdes, __const char *__msg_ptr,
 			 size_t __msg_len, unsigned int __msg_prio,
-			 const struct timespec *__abs_timeout);
+			 __const struct timespec *__abs_timeout)
+  __nonnull ((1, 4));
 #endif
 
 __END_DECLS