diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-29 12:12:39 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-11-29 12:12:39 +0000 |
commit | 0893220b2a4507fc2619b625ecb0d6241ef5cd6f (patch) | |
tree | 1f81a1c1fac15dc8f3cd86aef65cbcf261f01a97 /cpukit/libmisc/monitor | |
parent | Whitespace removal. (diff) | |
download | rtems-0893220b2a4507fc2619b625ecb0d6241ef5cd6f.tar.bz2 |
Whitespace removal.
Diffstat (limited to 'cpukit/libmisc/monitor')
-rw-r--r-- | cpukit/libmisc/monitor/mon-editor.c | 2 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-itask.c | 2 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-network.c | 84 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-part.c | 2 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-prmisc.c | 2 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-region.c | 2 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-sema.c | 10 | ||||
-rw-r--r-- | cpukit/libmisc/monitor/mon-task.c | 2 |
8 files changed, 53 insertions, 53 deletions
diff --git a/cpukit/libmisc/monitor/mon-editor.c b/cpukit/libmisc/monitor/mon-editor.c index a6e46a1f7e..644560699b 100644 --- a/cpukit/libmisc/monitor/mon-editor.c +++ b/cpukit/libmisc/monitor/mon-editor.c @@ -242,7 +242,7 @@ rtems_monitor_line_editor ( extended_key = rtems_monitor_getchar (); c = extended_key & KEYS_NORMAL_MASK; - + /* * Make the extended_key usable as a boolean. */ diff --git a/cpukit/libmisc/monitor/mon-itask.c b/cpukit/libmisc/monitor/mon-itask.c index 4cfaddab38..6dab51a768 100644 --- a/cpukit/libmisc/monitor/mon-itask.c +++ b/cpukit/libmisc/monitor/mon-itask.c @@ -101,7 +101,7 @@ rtems_monitor_init_task_dump( length += rtems_monitor_symbol_dump(&monitor_itask->entry, verbose); length += rtems_monitor_pad(25, length); - length += fprintf(stdout,"%" PRId32 " [0x%" PRIx32 "]", + length += fprintf(stdout,"%" PRId32 " [0x%" PRIx32 "]", monitor_itask->argument, monitor_itask->argument); length += rtems_monitor_pad(39, length); diff --git a/cpukit/libmisc/monitor/mon-network.c b/cpukit/libmisc/monitor/mon-network.c index cf703dafeb..2e3404b8a4 100644 --- a/cpukit/libmisc/monitor/mon-network.c +++ b/cpukit/libmisc/monitor/mon-network.c @@ -50,19 +50,19 @@ void mon_ifconfig(int argc, char *argv[], memset(&dstaddr, 0, sizeof(dstaddr)); memset(&netmask, 0, sizeof(netmask)); memset(&broadcast, 0, sizeof(broadcast)); - + ipaddr.sin_len = sizeof(ipaddr); ipaddr.sin_family = AF_INET; - + dstaddr.sin_len = sizeof(dstaddr); dstaddr.sin_family = AF_INET; - + netmask.sin_len = sizeof(netmask); netmask.sin_family = AF_INET; - + broadcast.sin_len = sizeof(broadcast); broadcast.sin_family = AF_INET; - + cur_idx = 0; if (argc <= 1) { /* display all interfaces */ @@ -81,11 +81,11 @@ void mon_ifconfig(int argc, char *argv[], cur_idx += 2; } } - + if ((f_down !=0) && (f_ip != 0)) { f_up = 1; } - + while(argc > cur_idx) { if (strcmp(argv[cur_idx], "up") == 0) { f_up = 1; @@ -101,7 +101,7 @@ void mon_ifconfig(int argc, char *argv[], if ((cur_idx + 1) >= argc) { printf("No netmask address\n"); return; - } + } if (inet_pton(AF_INET, argv[cur_idx+1], &netmask.sin_addr) < 0) { printf("bad netmask: %s\n", argv[cur_idx]); return; @@ -112,7 +112,7 @@ void mon_ifconfig(int argc, char *argv[], if ((cur_idx + 1) >= argc) { printf("No broadcast address\n"); return; - } + } if (inet_pton(AF_INET, argv[cur_idx+1], &broadcast.sin_addr) < 0) { printf("bad broadcast: %s\n", argv[cur_idx]); return; @@ -123,22 +123,22 @@ void mon_ifconfig(int argc, char *argv[], if ((cur_idx + 1) >= argc) { printf("No pointopoint address\n"); return; - } + } if (inet_pton(AF_INET, argv[cur_idx+1], &dstaddr.sin_addr) < 0) { printf("bad pointopoint: %s\n", argv[cur_idx]); return; } - + f_ptp = 1; cur_idx += 1; } else { printf("Bad parameter: %s\n", argv[cur_idx]); return; } - + cur_idx += 1; } - + printf("ifconfig "); if (iface != NULL) { printf("%s ", iface); @@ -147,25 +147,25 @@ void mon_ifconfig(int argc, char *argv[], inet_ntop(AF_INET, &ipaddr.sin_addr, str, 256); printf("%s ", str); } - + if (f_netmask != 0) { char str[256]; inet_ntop(AF_INET, &netmask.sin_addr, str, 256); printf("netmask %s ", str); } - + if (f_bcast != 0) { char str[256]; inet_ntop(AF_INET, &broadcast.sin_addr, str, 256); printf("broadcast %s ", str); } - + if (f_ptp != 0) { char str[256]; inet_ntop(AF_INET, &dstaddr.sin_addr, str, 256); printf("pointopoint %s ", str); } - + if (f_up != 0) { printf("up\n"); } else if (f_down != 0) { @@ -174,12 +174,12 @@ void mon_ifconfig(int argc, char *argv[], printf("\n"); } } - + if ((iface == NULL) || ((f_ip == 0) && (f_down == 0) && (f_up == 0))) { rtems_bsdnet_show_if_stats(); return; } - + flags = 0; if (f_netmask) { rc = rtems_bsdnet_ifconfig(iface, SIOCSIFNETMASK, &netmask); @@ -188,7 +188,7 @@ void mon_ifconfig(int argc, char *argv[], return; } } - + if (f_bcast) { rc = rtems_bsdnet_ifconfig(iface, SIOCSIFBRDADDR, &broadcast); if (rc < 0) { @@ -196,7 +196,7 @@ void mon_ifconfig(int argc, char *argv[], return; } } - + if (f_ptp) { rc = rtems_bsdnet_ifconfig(iface, SIOCSIFDSTADDR, &dstaddr); if (rc < 0) { @@ -205,8 +205,8 @@ void mon_ifconfig(int argc, char *argv[], } flags |= IFF_POINTOPOINT; } - - /* This must come _after_ setting the netmask, broadcast addresses */ + + /* This must come _after_ setting the netmask, broadcast addresses */ if (f_ip) { rc = rtems_bsdnet_ifconfig(iface, SIOCSIFADDR, &ipaddr); if (rc < 0) { @@ -214,15 +214,15 @@ void mon_ifconfig(int argc, char *argv[], return; } } - + if (f_up != 0) { flags |= IFF_UP; } - + if (f_down != 0) { printf("Warning: taking interfaces down is not supported\n"); } - + rc = rtems_bsdnet_ifconfig(iface, SIOCSIFFLAGS, &flags); if (rc < 0) { printf("Could not set interface flags: %s\n", strerror(errno)); @@ -245,28 +245,28 @@ void mon_route(int argc, char *argv[], int cur_idx; int flags; int rc; - + memset(&dst, 0, sizeof(dst)); memset(&gw, 0, sizeof(gw)); memset(&netmask, 0, sizeof(netmask)); - + dst.sin_len = sizeof(dst); dst.sin_family = AF_INET; - dst.sin_addr.s_addr = inet_addr("0.0.0.0"); - + dst.sin_addr.s_addr = inet_addr("0.0.0.0"); + gw.sin_len = sizeof(gw); gw.sin_family = AF_INET; - gw.sin_addr.s_addr = inet_addr("0.0.0.0"); - + gw.sin_addr.s_addr = inet_addr("0.0.0.0"); + netmask.sin_len = sizeof(netmask); netmask.sin_family = AF_INET; - netmask.sin_addr.s_addr = inet_addr("255.255.255.0"); - + netmask.sin_addr.s_addr = inet_addr("255.255.255.0"); + if (argc < 2) { rtems_bsdnet_show_inet_routes(); return; - } - + } + if (strcmp(argv[1], "add") == 0) { cmd = RTM_ADD; } else if (strcmp(argv[1], "del") == 0) { @@ -276,12 +276,12 @@ void mon_route(int argc, char *argv[], printf("\tit should be 'add' or 'del'\n"); return; } - + if (argc < 3) { printf("not enough arguments\n"); return; } - + if (strcmp(argv[2], "-host") == 0) { f_host = 1; } else if (strcmp(argv[2], "-net") == 0) { @@ -291,14 +291,14 @@ void mon_route(int argc, char *argv[], printf("\tit should be '-host' or '-net'\n"); return; } - + if (argc < 4) { printf("not enough arguments\n"); return; } - + inet_pton(AF_INET, argv[3], &dst.sin_addr); - + cur_idx = 4; while(cur_idx < argc) { if (strcmp(argv[cur_idx], "gw") == 0) { @@ -323,7 +323,7 @@ void mon_route(int argc, char *argv[], } cur_idx += 1; } - + flags = RTF_STATIC; if (f_gw != 0) { flags |= RTF_GATEWAY; diff --git a/cpukit/libmisc/monitor/mon-part.c b/cpukit/libmisc/monitor/mon-part.c index 82ae877299..4bdf3032e0 100644 --- a/cpukit/libmisc/monitor/mon-part.c +++ b/cpukit/libmisc/monitor/mon-part.c @@ -39,7 +39,7 @@ rtems_monitor_part_dump_header( ID NAME ATTR STARTADDR LENGTH BUF_SIZE USED_BLOCKS\n"); /*23456789 123456789 123456789 123456789 123456789 123456789 123456789 1234 1 2 3 4 5 6 7 */ - + rtems_monitor_separator(); } diff --git a/cpukit/libmisc/monitor/mon-prmisc.c b/cpukit/libmisc/monitor/mon-prmisc.c index 399d495abc..3f0c224f39 100644 --- a/cpukit/libmisc/monitor/mon-prmisc.c +++ b/cpukit/libmisc/monitor/mon-prmisc.c @@ -97,7 +97,7 @@ rtems_monitor_dump_name(rtems_id id) { char name_buffer[18]; - rtems_object_get_name( id, sizeof(name_buffer), name_buffer ); + rtems_object_get_name( id, sizeof(name_buffer), name_buffer ); return fprintf( stdout, name_buffer ); } diff --git a/cpukit/libmisc/monitor/mon-region.c b/cpukit/libmisc/monitor/mon-region.c index 8881bb21ff..06008214e4 100644 --- a/cpukit/libmisc/monitor/mon-region.c +++ b/cpukit/libmisc/monitor/mon-region.c @@ -40,7 +40,7 @@ rtems_monitor_region_dump_header( ID NAME ATTR STARTADDR LENGTH PAGE_SIZE USED_BLOCKS\n"); /*23456789 123456789 123456789 123456789 123456789 123456789 123456789 1234 1 2 3 4 5 6 7 */ - + rtems_monitor_separator(); } diff --git a/cpukit/libmisc/monitor/mon-sema.c b/cpukit/libmisc/monitor/mon-sema.c index 12282ce148..276601c04c 100644 --- a/cpukit/libmisc/monitor/mon-sema.c +++ b/cpukit/libmisc/monitor/mon-sema.c @@ -23,18 +23,18 @@ rtems_monitor_sema_canonical( Semaphore_Control *rtems_sema = (Semaphore_Control *) sema_void; canonical_sema->attribute = rtems_sema->attribute_set; - canonical_sema->priority_ceiling = + canonical_sema->priority_ceiling = rtems_sema->Core_control.mutex.Attributes.priority_ceiling; - canonical_sema->holder_id = + canonical_sema->holder_id = rtems_sema->Core_control.mutex.holder_id; if (_Attributes_Is_counting_semaphore(canonical_sema->attribute)) { /* we have a counting semaphore */ - canonical_sema->cur_count = + canonical_sema->cur_count = rtems_sema->Core_control.semaphore.count; - canonical_sema->max_count = + canonical_sema->max_count = rtems_sema->Core_control.semaphore.Attributes.maximum_count; } else { @@ -54,7 +54,7 @@ rtems_monitor_sema_dump_header( ID NAME ATTR PRICEIL CURR_CNT HOLDID \n"); /*23456789 123456789 123456789 123456789 123456789 123456789 123456789 1234 1 2 3 4 5 6 7 */ - + rtems_monitor_separator(); } diff --git a/cpukit/libmisc/monitor/mon-task.c b/cpukit/libmisc/monitor/mon-task.c index 9378436fef..6007b3f879 100644 --- a/cpukit/libmisc/monitor/mon-task.c +++ b/cpukit/libmisc/monitor/mon-task.c @@ -33,7 +33,7 @@ rtems_monitor_task_canonical( canonical_task->state = rtems_thread->current_state; canonical_task->wait_id = rtems_thread->Wait.id; canonical_task->events = api->pending_events; - /* + /* * FIXME: make this optionally cpu_time_executed */ #if 0 |