diff options
author | Sverker Eriksson <[email protected]> | 2013-02-22 15:15:01 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2013-02-22 15:15:01 +0100 |
commit | 13b1dcfc31b3c42affafc42c30105abfbebbfbf3 (patch) | |
tree | 8fa0291b2bd2dc9a1e800198c532a724a5b05f0e /lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c | |
parent | 7ad014ac10d87f520d031a9d969473a6bfe20bee (diff) | |
parent | 969224f54bec6d932aa61b9acc8e76b49604ebcc (diff) | |
download | otp-13b1dcfc31b3c42affafc42c30105abfbebbfbf3.tar.gz otp-13b1dcfc31b3c42affafc42c30105abfbebbfbf3.tar.bz2 otp-13b1dcfc31b3c42affafc42c30105abfbebbfbf3.zip |
Merge branch 'sverk/erlang_pid-revert'
* sverk/erlang_pid-revert:
erl_interface: Fix some warnings in test code
erl_interface,ic: Remove node_org_enc from erlang_{pid,port,ref}
Diffstat (limited to 'lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c')
-rw-r--r-- | lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c index 4ced4fb5e5..f352b91fd5 100644 --- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c +++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/c_client.c @@ -393,7 +393,6 @@ int main(int argc, char **argv) env->_from_pid = &pid; strcpy(pid.node, this_node); - pid.node_org_enc = ERLANG_LATIN1; pid.num = fd; pid.serial = 0; pid.creation = 0; @@ -1010,7 +1009,7 @@ static int string4_test(IC_Env *env) static int pid_test(IC_Env *env) { - erlang_pid pid = {"", ERLANG_LATIN1, 7, 0, 0}, pido, pidr; + erlang_pid pid = {"", 7, 0, 0}, pido, pidr; strcpy(pid.node, this_node), /* this currently running node */ fprintf(stdout, "\n======== m_i_pid test ======\n\n"); @@ -1034,7 +1033,7 @@ static int pid_test(IC_Env *env) static int port_test(IC_Env *env) { - erlang_port porti = {"node", ERLANG_LATIN1, 5, 1}, porto, portr; + erlang_port porti = {"node", 5, 1}, porto, portr; fprintf(stdout, "\n======== m_i_port test ======\n\n"); portr = m_i_port_test(NULL, &porti, &porto, env); @@ -1057,7 +1056,7 @@ static int port_test(IC_Env *env) static int ref_test(IC_Env *env) { - erlang_ref refi = { "node1", ERLANG_LATIN1, 3, {1, 2, 3}, 1}, + erlang_ref refi = { "node1", 3, {1, 2, 3}, 1}, refo, refr; fprintf(stdout, "\n======== m_i_ref test ======\n\n"); @@ -1115,7 +1114,6 @@ static int typedef_test(IC_Env *env) long tl; strcpy(mbi.node,"node"); - mbi.node_org_enc = ERLANG_LATIN1; mbi.id = 15; mbi.creation = 1; |