cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

misc: Do not prepend 0x when using %p in printf.

This commit is contained in:
Holger Hans Peter Freyther 2010-06-15 18:48:44 +08:00
parent d7657ffc84
commit 72ba1624b3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openbsc/src/nat/bsc_sccp.c
View File

@ -101,7 +101,7 @@ int create_sccp_src_ref(struct bsc_connection *bsc, struct msgb *msg, struct bsc
llist_add(&conn->list_entry, &bsc->nat->sccp_connections);
LOGP(DNAT, LOGL_DEBUG, "Created 0x%x <-> 0x%x mapping for con 0x%p\n",
LOGP(DNAT, LOGL_DEBUG, "Created 0x%x <-> 0x%x mapping for con %p\n",
sccp_src_ref_to_int(&conn->real_ref),
sccp_src_ref_to_int(&conn->patched_ref), bsc);
@ -126,13 +126,13 @@ int update_sccp_src_ref(struct bsc_connection *bsc, struct msgb *msg, struct bsc
continue;
conn->remote_ref = *parsed->src_local_ref;
LOGP(DNAT, LOGL_DEBUG, "Updating 0x%x to remote 0x%x on 0x%p\n",
LOGP(DNAT, LOGL_DEBUG, "Updating 0x%x to remote 0x%x on %p\n",
sccp_src_ref_to_int(&conn->patched_ref),
sccp_src_ref_to_int(&conn->remote_ref), bsc);
return 0;
}
LOGP(DNAT, LOGL_ERROR, "Referenced connection not found on BSC: 0x%p\n", bsc);
LOGP(DNAT, LOGL_ERROR, "Referenced connection not found on BSC: %p\n", bsc);
return -1;
}
@ -148,7 +148,7 @@ void remove_sccp_src_ref(struct bsc_connection *bsc, struct msgb *msg, struct bs
if (bsc != conn->bsc)
continue;
LOGP(DNAT, LOGL_DEBUG, "Destroy 0x%x <-> 0x%x mapping for con 0x%p\n",
LOGP(DNAT, LOGL_DEBUG, "Destroy 0x%x <-> 0x%x mapping for con %p\n",
sccp_src_ref_to_int(&conn->real_ref),
sccp_src_ref_to_int(&conn->patched_ref), bsc);
llist_del(&conn->list_entry);

10
openbsc/tests/bsc-nat/bsc_nat_test.c
View File

@ -190,7 +190,7 @@ static void copy_to_msg(struct msgb *msg, const u_int8_t *data, unsigned int len
#define VERIFY(con_found, con, msg, ver, str) \
if (con_found != con) { \
fprintf(stderr, "Failed to find the con: 0x%p\n", con_found); \
fprintf(stderr, "Failed to find the con: %p\n", con_found); \
abort(); \
} \
if (memcmp(msg->data, ver, sizeof(ver)) != 0) { \
@ -217,7 +217,7 @@ static void test_contrack()
parsed = bsc_nat_parse(msg);
con_found = patch_sccp_src_ref_to_msc(msg, parsed, nat);
if (con_found != NULL) {
fprintf(stderr, "Con should not exist 0x%p\n", con_found);
fprintf(stderr, "Con should not exist %p\n", con_found);
abort();
}
rc = create_sccp_src_ref(con, msg, parsed);
@ -227,7 +227,7 @@ static void test_contrack()
}
con_found = patch_sccp_src_ref_to_msc(msg, parsed, nat);
if (con_found != con) {
fprintf(stderr, "Failed to find the con: 0x%p\n", con_found);
fprintf(stderr, "Failed to find the con: %p\n", con_found);
abort();
}
if (memcmp(msg->data, bsc_cr_patched, sizeof(bsc_cr_patched)) != 0) {
@ -269,7 +269,7 @@ static void test_contrack()
parsed = bsc_nat_parse(msg);
con_found = patch_sccp_src_ref_to_msc(msg, parsed, nat);
if (con_found != con) {
fprintf(stderr, "Failed to find the con: 0x%p\n", con_found);
fprintf(stderr, "Failed to find the con: %p\n", con_found);
abort();
}
if (memcmp(msg->data, bsc_rlc_patched, sizeof(bsc_rlc_patched)) != 0) {
@ -281,7 +281,7 @@ static void test_contrack()
/* verify that it is gone */
if (con_found != NULL) {
fprintf(stderr, "Con should be gone. 0x%p\n", con_found);
fprintf(stderr, "Con should be gone. %p\n", con_found);
abort();
}
talloc_free(parsed);