Changeset 352d01e in rtems

Timestamp:

Jan 12, 2000, 6:43:21 PM (21 years ago)

Author:

Jennifer Averett <Jennifer.Averett@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

bcbc50a

Parents:

70329c80

Message:

+ Modified to correct return codes.
+ Removed extra flag attribute from message queue structure.
+ Yellow-lined all posix message queue routines.

Files:

• c/src/exec/posix/src/mqueuegetattr.c (modified) (2 diffs)
• cpukit/posix/src/mqueuegetattr.c (modified) (2 diffs)

c/src/exec/posix/src/mqueuegetattr.c

@@ -43 +43 @@
   CORE_message_queue_Attributes        *the_mq_attr;
  
+  if ( !mqstat )
+    set_errno_and_return_minus_one( EINVAL );
+
   the_mq = _POSIX_Message_queue_Get( mqdes, &location );
   switch ( location ) {
     case OBJECTS_ERROR:
-      set_errno_and_return_minus_one( EINVAL );
+      set_errno_and_return_minus_one( EBADF );
     case OBJECTS_REMOTE:
       _Thread_Dispatch();
@@ -61 +64 @@
       the_mq_attr = &the_mq->Message_queue.Attributes;
  
-      mqstat->mq_flags   = the_mq->flags;
+      mqstat->mq_flags   = the_mq->oflag;
       mqstat->mq_msgsize = the_mq->Message_queue.maximum_message_size;
       mqstat->mq_maxmsg  = the_mq->Message_queue.maximum_pending_messages;

cpukit/posix/src/mqueuegetattr.c

@@ -43 +43 @@
   CORE_message_queue_Attributes        *the_mq_attr;
  
+  if ( !mqstat )
+    set_errno_and_return_minus_one( EINVAL );
+
   the_mq = _POSIX_Message_queue_Get( mqdes, &location );
   switch ( location ) {
     case OBJECTS_ERROR:
-      set_errno_and_return_minus_one( EINVAL );
+      set_errno_and_return_minus_one( EBADF );
     case OBJECTS_REMOTE:
       _Thread_Dispatch();
@@ -61 +64 @@
       the_mq_attr = &the_mq->Message_queue.Attributes;
  
-      mqstat->mq_flags   = the_mq->flags;
+      mqstat->mq_flags   = the_mq->oflag;
       mqstat->mq_msgsize = the_mq->Message_queue.maximum_message_size;
       mqstat->mq_maxmsg  = the_mq->Message_queue.maximum_pending_messages;