From: Arnaud Giersch Date: Thu, 14 Feb 2013 14:25:43 +0000 (+0100) Subject: Replace, when possible, calls to bprintf() by calls to xbt_strdup(). X-Git-Tag: v3_9_90~491^2~24 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e0365935e018f9d810dc0f4d17fbc8ef31ec18b0 Replace, when possible, calls to bprintf() by calls to xbt_strdup(). --- diff --git a/examples/msg/bittorrent/bittorrent_platfgen.c b/examples/msg/bittorrent/bittorrent_platfgen.c index 77d2da5a64..62bbf492b9 100644 --- a/examples/msg/bittorrent/bittorrent_platfgen.c +++ b/examples/msg/bittorrent/bittorrent_platfgen.c @@ -96,21 +96,21 @@ void dispatch_jobs(double tracker_deadline, double peer_deadline, double seed_pe if(i==0) { //The fisrt node is the tracker arguments_tracker = xbt_malloc0(sizeof(char*) * 2); - arguments_tracker[0] = bprintf("tracker"); + arguments_tracker[0] = xbt_strdup("tracker"); arguments_tracker[1] = bprintf("%f", tracker_deadline); MSG_process_create_with_arguments("tracker", tracker, NULL, host, 2, arguments_tracker); } else { //Other nodes are peers int argument_size; arguments_peer = xbt_malloc0(sizeof(char*) * 4); - arguments_peer[0] = bprintf("peer"); + arguments_peer[0] = xbt_strdup("peer"); arguments_peer[1] = bprintf("%d", i); arguments_peer[2] = bprintf("%f", peer_deadline); //The first peers will be seeders if(seed_count > 0) { seed_count--; - arguments_peer[3] = bprintf("1"); + arguments_peer[3] = xbt_strdup("1"); argument_size = 4; } else { //Other ars leechers diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c index 0eb2cb459c..fc799860ba 100644 --- a/examples/msg/io/file.c +++ b/examples/msg/io/file.c @@ -35,7 +35,7 @@ int host(int argc, char *argv[]) msg_file_t file = NULL; s_msg_stat_t stat; void *ptr = NULL; - char* mount = bprintf("/home"); + char* mount = xbt_strdup("/home"); double read,write; if(!strcmp(MSG_process_get_name(MSG_process_self()),"0")) diff --git a/examples/msg/io/file_unlink.c b/examples/msg/io/file_unlink.c index d9f6c01a61..f230372e11 100644 --- a/examples/msg/io/file_unlink.c +++ b/examples/msg/io/file_unlink.c @@ -32,7 +32,7 @@ int host(int argc, char *argv[]) msg_file_t file = NULL; s_msg_stat_t stat; void *ptr = NULL; - char* mount = bprintf("/home"); + char* mount = xbt_strdup("/home"); double write; // First open @@ -113,7 +113,7 @@ int main(int argc, char **argv) MSG_function_register("host", host); unsigned long nb_hosts = xbt_dynar_length(hosts); XBT_INFO("Number of host '%lu'",nb_hosts); - char* name_host = bprintf("0"); + char* name_host = xbt_strdup("0"); MSG_process_create( name_host, host, NULL, xbt_dynar_get_as(hosts,0,msg_host_t) ); free(name_host); diff --git a/examples/msg/mc/bugged1_liveness.c b/examples/msg/mc/bugged1_liveness.c index 458f5093d2..7fc5066c19 100644 --- a/examples/msg/mc/bugged1_liveness.c +++ b/examples/msg/mc/bugged1_liveness.c @@ -61,7 +61,7 @@ int client(int argc, char *argv[]) { int my_pid = MSG_process_get_PID(MSG_process_self()); - char *my_mailbox = bprintf("%s", argv[1]); + char *my_mailbox = xbt_strdup(argv[1]); msg_task_t grant = NULL, release = NULL; diff --git a/examples/msg/mc/bugged2_liveness.c b/examples/msg/mc/bugged2_liveness.c index fb7c2d854b..7117b49b79 100644 --- a/examples/msg/mc/bugged2_liveness.c +++ b/examples/msg/mc/bugged2_liveness.c @@ -56,7 +56,7 @@ int coordinator(int argc, char *argv[]) int client(int argc, char *argv[]) { int my_pid = MSG_process_get_PID(MSG_process_self()); - char *my_mailbox = bprintf("%s", argv[1]); + char *my_mailbox = xbt_strdup(argv[1]); const char* kind; while(1){ diff --git a/src/bindings/java/jmsg.c b/src/bindings/java/jmsg.c index 6c4b587462..8a6a626e11 100644 --- a/src/bindings/java/jmsg.c +++ b/src/bindings/java/jmsg.c @@ -62,7 +62,7 @@ void jmsg_throw_status(JNIEnv *env, msg_error_t status) { jxbt_throw_host_failure(env,NULL); break; default: - jxbt_throw_native(env,bprintf("communication failed")); + jxbt_throw_native(env,xbt_strdup("communication failed")); } } @@ -144,8 +144,7 @@ JNIEXPORT void JNICALL rv = MSG_main(); XBT_DEBUG("Done running MSG_MAIN"); jxbt_check_res("MSG_main()", rv, MSG_OK, - bprintf - ("unexpected error : MSG_main() failed .. please report this bug ")); + xbt_strdup("unexpected error : MSG_main() failed .. please report this bug ")); XBT_INFO("MSG_main finished; Cleaning up the simulation..."); /* Cleanup java hosts */ diff --git a/src/bindings/java/smx_context_cojava.c b/src/bindings/java/smx_context_cojava.c index 902d17ffb0..9e69d06e57 100644 --- a/src/bindings/java/smx_context_cojava.c +++ b/src/bindings/java/smx_context_cojava.c @@ -181,7 +181,7 @@ void smx_ctx_cojava_stop(smx_context_t context) if (context->iwannadie) { context->iwannadie = 0; JNIEnv *env = get_current_thread_env(); - jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", bprintf("Process killed :)")); + jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", xbt_strdup("Process killed :)")); THROWF(cancel_error, 0, "process cancelled"); } else { diff --git a/src/bindings/java/smx_context_java.c b/src/bindings/java/smx_context_java.c index 9a78a40d2d..08a4a74d38 100644 --- a/src/bindings/java/smx_context_java.c +++ b/src/bindings/java/smx_context_java.c @@ -148,12 +148,11 @@ void smx_ctx_java_stop(smx_context_t context) smx_ctx_java_t ctx_java = (smx_ctx_java_t)context; /* I am the current process and I am dying */ if (context->iwannadie) { - context->iwannadie = 0; - JNIEnv *env = get_current_thread_env(); - jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", bprintf("Process killed :)")); - THROWF(cancel_error, 0, "process cancelled"); - } - else { + context->iwannadie = 0; + JNIEnv *env = get_current_thread_env(); + jxbt_throw_by_name(env, "org/simgrid/msg/ProcessKilledError", xbt_strdup("Process killed :)")); + THROWF(cancel_error, 0, "process cancelled"); + } else { smx_ctx_base_stop(context); /* detach the thread and kills it */ JNIEnv *env = ctx_java->jenv; diff --git a/src/simix/smx_host.c b/src/simix/smx_host.c index 114e14b6c2..5bd6088b96 100644 --- a/src/simix/smx_host.c +++ b/src/simix/smx_host.c @@ -51,8 +51,7 @@ void SIMIX_host_destroy(void *h) /* Clean Simulator data */ if (xbt_swag_size(host->process_list) != 0) { - char *msg = - bprintf("Shutting down host, but it's not empty:"); + char *msg = xbt_strdup("Shutting down host, but it's not empty:"); char *tmp; smx_process_t process = NULL; diff --git a/src/xbt/log.c b/src/xbt/log.c index adaa919f06..a0897143ee 100644 --- a/src/xbt/log.c +++ b/src/xbt/log.c @@ -1345,8 +1345,8 @@ static void xbt_log_help_categories_rec(xbt_log_category_t category, this_prefix = bprintf("%s \\_ ", prefix); child_prefix = bprintf("%s | ", prefix); } else { - this_prefix = bprintf("%s", prefix); - child_prefix = bprintf("%s", prefix); + this_prefix = xbt_strdup(prefix); + child_prefix = xbt_strdup(prefix); } dynar = xbt_dynar_new(sizeof(xbt_log_category_t), NULL);