summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-10-24 22:19:27 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-10-24 22:19:27 +0000
commit12857dda9ab9c5945fbe348a86b2accf6fa33949 (patch)
tree44a1761c39d49a1ff6decefca5e3232193c6e4e3
parent38ad16305474b8d2c335bde061a818eefdc1a14a (diff)
downloadrtems-12857dda9ab9c5945fbe348a86b2accf6fa33949.tar.bz2
2002-10-24 Fabrizio Pirovano <pirovano.thysys@tiscalinet.it>
* capture/capture.c, monitor/mon-manager.c, stackchk/check.c: Patch to remove problems introduced by object name rework.
-rw-r--r--c/src/libmisc/ChangeLog5
-rw-r--r--c/src/libmisc/capture/capture.c2
-rw-r--r--c/src/libmisc/monitor/mon-manager.c9
-rw-r--r--c/src/libmisc/stackchk/check.c2
-rw-r--r--cpukit/libmisc/ChangeLog5
-rw-r--r--cpukit/libmisc/capture/capture.c2
-rw-r--r--cpukit/libmisc/monitor/mon-manager.c9
-rw-r--r--cpukit/libmisc/stackchk/check.c2
8 files changed, 26 insertions, 10 deletions
diff --git a/c/src/libmisc/ChangeLog b/c/src/libmisc/ChangeLog
index b18863c2aa..e762486bf8 100644
--- a/c/src/libmisc/ChangeLog
+++ b/c/src/libmisc/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-24 Fabrizio Pirovano <pirovano.thysys@tiscalinet.it>
+
+ * capture/capture.c, monitor/mon-manager.c, stackchk/check.c:
+ Patch to remove problems introduced by object name rework.
+
2002-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Reformat.
diff --git a/c/src/libmisc/capture/capture.c b/c/src/libmisc/capture/capture.c
index a543cb5979..1a5ef9b497 100644
--- a/c/src/libmisc/capture/capture.c
+++ b/c/src/libmisc/capture/capture.c
@@ -318,7 +318,7 @@ rtems_capture_create_capture_task (rtems_tcb* new_task)
return NULL;
}
- rtems_capture_dup_name (&task->name, *((rtems_name*) new_task->Object.name));
+ rtems_capture_dup_name (&task->name, ((rtems_name) new_task->Object.name));
task->id = new_task->Object.id;
task->flags = 0;
diff --git a/c/src/libmisc/monitor/mon-manager.c b/c/src/libmisc/monitor/mon-manager.c
index 497f0255a0..19ed78de95 100644
--- a/c/src/libmisc/monitor/mon-manager.c
+++ b/c/src/libmisc/monitor/mon-manager.c
@@ -39,9 +39,12 @@ rtems_monitor_manager_next(
{
copy = (rtems_monitor_generic_t *) canonical;
copy->id = object->id;
- _Objects_Copy_name_raw(object->name, &copy->name, sizeof(copy->name));
- }
-
+ if(table->is_string)
+ _Objects_Copy_name_raw(object->name, &copy->name, sizeof(copy->name));
+ else
+ _Objects_Copy_name_raw(&object->name, &copy->name, sizeof(copy->name));
+ }
+
done:
return object;
}
diff --git a/c/src/libmisc/stackchk/check.c b/c/src/libmisc/stackchk/check.c
index c0e01728c0..8be5346fd5 100644
--- a/c/src/libmisc/stackchk/check.c
+++ b/c/src/libmisc/stackchk/check.c
@@ -314,7 +314,7 @@ void Stack_check_report_blown_task(void)
"BLOWN STACK!!! Offending task(%p): id=0x%08x; name=0x%08x",
running,
running->Object.id,
- *(unsigned32 *)running->Object.name
+ (unsigned32)running->Object.name
);
fflush(stderr);
diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog
index b18863c2aa..e762486bf8 100644
--- a/cpukit/libmisc/ChangeLog
+++ b/cpukit/libmisc/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-24 Fabrizio Pirovano <pirovano.thysys@tiscalinet.it>
+
+ * capture/capture.c, monitor/mon-manager.c, stackchk/check.c:
+ Patch to remove problems introduced by object name rework.
+
2002-10-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .cvsignore: Reformat.
diff --git a/cpukit/libmisc/capture/capture.c b/cpukit/libmisc/capture/capture.c
index a543cb5979..1a5ef9b497 100644
--- a/cpukit/libmisc/capture/capture.c
+++ b/cpukit/libmisc/capture/capture.c
@@ -318,7 +318,7 @@ rtems_capture_create_capture_task (rtems_tcb* new_task)
return NULL;
}
- rtems_capture_dup_name (&task->name, *((rtems_name*) new_task->Object.name));
+ rtems_capture_dup_name (&task->name, ((rtems_name) new_task->Object.name));
task->id = new_task->Object.id;
task->flags = 0;
diff --git a/cpukit/libmisc/monitor/mon-manager.c b/cpukit/libmisc/monitor/mon-manager.c
index 497f0255a0..19ed78de95 100644
--- a/cpukit/libmisc/monitor/mon-manager.c
+++ b/cpukit/libmisc/monitor/mon-manager.c
@@ -39,9 +39,12 @@ rtems_monitor_manager_next(
{
copy = (rtems_monitor_generic_t *) canonical;
copy->id = object->id;
- _Objects_Copy_name_raw(object->name, &copy->name, sizeof(copy->name));
- }
-
+ if(table->is_string)
+ _Objects_Copy_name_raw(object->name, &copy->name, sizeof(copy->name));
+ else
+ _Objects_Copy_name_raw(&object->name, &copy->name, sizeof(copy->name));
+ }
+
done:
return object;
}
diff --git a/cpukit/libmisc/stackchk/check.c b/cpukit/libmisc/stackchk/check.c
index c0e01728c0..8be5346fd5 100644
--- a/cpukit/libmisc/stackchk/check.c
+++ b/cpukit/libmisc/stackchk/check.c
@@ -314,7 +314,7 @@ void Stack_check_report_blown_task(void)
"BLOWN STACK!!! Offending task(%p): id=0x%08x; name=0x%08x",
running,
running->Object.id,
- *(unsigned32 *)running->Object.name
+ (unsigned32)running->Object.name
);
fflush(stderr);