dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected spacing on WhoIs demo output.

Browse Source
This commit is contained in:
skarg
2009-10-28 21:07:53 +00:00
parent e98424b9aa
commit d6c4b11854
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/whois/main.c
+18 -13
View File
@@ -116,42 +116,47 @@ static void print_address_cache(
uint32_t device_id = 0; uint32_t device_id = 0;
unsigned max_apdu = 0; unsigned max_apdu = 0;
/* printf("%-7s %-14s %-4s %-5s %-14s\n", "Device", "MAC", "APDU", "SNET", "SADR"); */ printf(";%-7s %-20s %-5s %-20s %-4s\n", "Device", "MAC", "SNET", "SADR",
printf(";%-7s %-17s %-5s %-17s %-4s\n", "Device", "MAC", "SNET", "SADR",
"APDU"); "APDU");
printf(";------- ----------------- ----- ----------------- ----\n"); printf(";------- -------------------- ----- -------------------- ----\n");
for (i = 0; i < MAX_ADDRESS_CACHE; i++) { for (i = 0; i < MAX_ADDRESS_CACHE; i++) {
if (address_get_by_index(i, &device_id, &max_apdu, &address)) { if (address_get_by_index(i, &device_id, &max_apdu, &address)) {
printf(" %-7u ", device_id); printf(" %-7u ", device_id);
for (j = 0; j < MAX_MAC_LEN; j++) { for (j = 0; j < MAX_MAC_LEN; j++) {
if (j < address.mac_len) { if (j < address.mac_len) {
if (j > 0) if (j > 0) {
printf(":"); printf(":");
}
printf("%02X", address.mac[j]); printf("%02X", address.mac[j]);
} else { } else {
printf(" "); if (j > 0) {
printf(" ");
}
printf(" ");
} }
} }
printf("%-5hu ", address.net); printf(" %-5hu ", address.net);
if (address.net) { if (address.net) {
for (j = 0; j < MAX_MAC_LEN; j++) { for (j = 0; j < MAX_MAC_LEN; j++) {
if (j < address.len) { if (j < address.len) {
if (j > 0) if (j > 0) {
printf(":"); printf(":");
}
printf("%02X", address.adr[j]); printf("%02X", address.adr[j]);
} else { } else {
printf(" "); if (j > 0) {
printf(" ");
}
printf(" ");
} }
/*printf(" "); */
} }
} else { } else {
printf("0 "); printf("0 ");
for (j = 2; j < MAX_MAC_LEN; j++) { for (j = 1; j < MAX_MAC_LEN; j++) {
printf(" "); printf(" ");
} }
printf("");
} }
printf("%-4hu ", max_apdu); printf(" %-4hu ", max_apdu);
printf("\n"); printf("\n");
} }
} }