From 3472845ecdabe9cd1549dd2b2355ca745059ea36 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 27 Aug 2009 00:56:39 -0400 Subject: [PATCH] Replace owl_sprintf with g_strdup_printf. Signed-off-by: Anders Kaseorg Reviewed-by: Karl Ramm --- aim.c | 2 +- cmd.c | 6 +++--- commands.c | 2 +- functions.c | 48 ++++++++++++++++++++++++------------------------ global.c | 6 +++--- keymap.c | 2 +- logging.c | 10 +++++----- message.c | 6 +++--- owl.c | 2 +- perlconfig.c | 6 +++--- util.c | 21 ++++----------------- zephyr.c | 32 ++++++++++++++++---------------- zwrite.c | 12 ++++++------ 13 files changed, 71 insertions(+), 84 deletions(-) diff --git a/aim.c b/aim.c index 5f7179ad0..f4a164bf2 100644 --- a/aim.c +++ b/aim.c @@ -200,7 +200,7 @@ void owl_aim_successful_login(const char *screenname) owl_global_set_aimloggedin(&g, screenname); owl_global_set_doaimevents(&g); /* this should already be on */ owl_function_makemsg("%s logged in", screenname); - buff=owl_sprintf("Logged in to AIM as %s", screenname); + buff=g_strdup_printf("Logged in to AIM as %s", screenname); owl_function_adminmsg("", buff); g_free(buff); diff --git a/cmd.c b/cmd.c index 5feaf9e63..dc3ba0106 100644 --- a/cmd.c +++ b/cmd.c @@ -146,7 +146,7 @@ int owl_cmd_create_alias(owl_cmd *cmd, const char *name, const char *aliased_to) memset(cmd, 0, sizeof(owl_cmd)); cmd->name = g_strdup(name); cmd->cmd_aliased_to = g_strdup(aliased_to); - cmd->summary = owl_sprintf("%s%s", OWL_CMD_ALIAS_SUMMARY_PREFIX, aliased_to); + cmd->summary = g_strdup_printf("%s%s", OWL_CMD_ALIAS_SUMMARY_PREFIX, aliased_to); return(0); } @@ -185,7 +185,7 @@ char *owl_cmd_execute(const owl_cmd *cmd, const owl_cmddict *cd, const owl_conte owl_function_makemsg("Alias loop detected for '%s'.", cmdbuff); } else { cmdbuffargs = skiptokens(cmdbuff, 1); - newcmd = owl_sprintf("%s %s", cmd->cmd_aliased_to, cmdbuffargs); + newcmd = g_strdup_printf("%s %s", cmd->cmd_aliased_to, cmdbuffargs); rv = owl_function_command(newcmd); g_free(newcmd); } @@ -246,7 +246,7 @@ const char *owl_cmd_get_summary(const owl_cmd *cmd) { /* returns a summary line describing this keymap. the caller must free. */ char *owl_cmd_describe(const owl_cmd *cmd) { if (!cmd || !cmd->name || !cmd->summary) return NULL; - return owl_sprintf("%-25s - %s", cmd->name, cmd->summary); + return g_strdup_printf("%-25s - %s", cmd->name, cmd->summary); } diff --git a/commands.c b/commands.c index 41c31ecdc..4f98e0721 100644 --- a/commands.c +++ b/commands.c @@ -1412,7 +1412,7 @@ char *owl_command_get_shift(int argc, const char *const *argv, const char *buff) owl_function_makemsg("Wrong number of arguments for %s", argv[0]); return NULL; } - return owl_sprintf("%d", owl_global_get_rightshift(&g)); + return g_strdup_printf("%d", owl_global_get_rightshift(&g)); } void owl_command_set_shift(int shift) diff --git a/functions.c b/functions.c index 1b2d9b045..ddb3eac25 100644 --- a/functions.c +++ b/functions.c @@ -95,13 +95,13 @@ void owl_function_show_styles(void) { static void _owl_function_timer_append_fmtext(gpointer data, gpointer user_data) { owl_fmtext *fm = user_data; owl_timer *timer = data; - char *str = owl_sprintf("- %s: in %d seconds", - timer->name ? timer->name : "(unnamed)", - (int)(timer->time - time(NULL))); + char *str = g_strdup_printf("- %s: in %d seconds", + timer->name ? timer->name : "(unnamed)", + (int)(timer->time - time(NULL))); owl_fmtext_append_normal(fm, str); g_free(str); if (timer->interval) { - str = owl_sprintf(", repeat every %d seconds", timer->interval); + str = g_strdup_printf(", repeat every %d seconds", timer->interval); owl_fmtext_append_normal(fm, str); g_free(str); } @@ -132,9 +132,9 @@ char *owl_function_style_describe(const char *name) { } else { desc = "???"; } - s = owl_sprintf("%-20s - %s%s", name, - 0==owl_style_validate(style)?"":"[INVALID] ", - desc); + s = g_strdup_printf("%-20s - %s%s", name, + 0 == owl_style_validate(style) ? "" : "[INVALID] ", + desc); return s; } @@ -215,7 +215,7 @@ void owl_function_show_quickstart(void) if (owl_perlconfig_is_function("BarnOwl::Hooks::_get_quickstart")) { char *perlquickstart = owl_perlconfig_execute("BarnOwl::Hooks::_get_quickstart()"); if (perlquickstart) { - char *result = owl_sprintf("%s%s", message, perlquickstart); + char *result = g_strdup_printf("%s%s", message, perlquickstart); owl_function_adminmsg("BarnOwl Quickstart", result); g_free(result); g_free(perlquickstart); @@ -310,7 +310,7 @@ void owl_function_start_edit_win(const char *line, void (*callback)(owl_editwin e = owl_global_set_typwin_active(&g, OWL_EDITWIN_STYLE_MULTILINE, owl_global_get_msg_history(&g)); owl_editwin_set_dotsend(e); - s = owl_sprintf("----> %s\n", line); + s = g_strdup_printf("----> %s\n", line); owl_editwin_set_locktext(e, s); g_free(s); @@ -353,7 +353,7 @@ void owl_function_aimwrite_setup(const char *to) { /* TODO: We probably actually want an owl_aimwrite object like * owl_zwrite. */ - char *line = owl_sprintf("aimwrite %s", to); + char *line = g_strdup_printf("aimwrite %s", to); owl_function_write_setup("message"); owl_function_start_edit_win(line, &owl_callback_aimwrite, @@ -437,7 +437,7 @@ void owl_function_zcrypt(owl_zwrite *z, const char *msg) } old_msg = g_strdup(owl_zwrite_get_message(z)); - zcrypt = owl_sprintf("%s/zcrypt", owl_get_bindir()); + zcrypt = g_strdup_printf("%s/zcrypt", owl_get_bindir()); argv[0] = "zcrypt"; argv[1] = "-E"; argv[2] = "-c"; argv[3] = owl_zwrite_get_class(z); @@ -1990,7 +1990,7 @@ char *owl_function_exec(int argc, const char *const *argv, const char *buff, int } buff = skiptokens(buff, 1); - newbuff = owl_sprintf("%s%s", buff, redirect); + newbuff = g_strdup_printf("%s%s", buff, redirect); if (type == OWL_OUTPUT_POPUP) { owl_popexec_new(newbuff); @@ -2192,7 +2192,7 @@ char *owl_function_create_negative_filter(const char *filtername) if (!strncmp(filtername, "not-", 4)) { newname=g_strdup(filtername+4); } else { - newname=owl_sprintf("not-%s", filtername); + newname=g_strdup_printf("not-%s", filtername); } tmpfilt=owl_global_get_filter(&g, newname); @@ -2244,7 +2244,7 @@ void owl_function_show_filter(const char *name) return; } tmp = owl_filter_print(f); - buff = owl_sprintf("%s: %s", owl_filter_get_name(f), tmp); + buff = g_strdup_printf("%s: %s", owl_filter_get_name(f), tmp); owl_function_popless_text(buff); g_free(buff); g_free(tmp); @@ -2304,9 +2304,9 @@ char *owl_function_classinstfilt(const char *c, const char *i, int related) /* name for the filter */ if (!instance) { - filtname = owl_sprintf("%sclass-%s", related ? "related-" : "", class); + filtname = g_strdup_printf("%sclass-%s", related ? "related-" : "", class); } else { - filtname = owl_sprintf("%sclass-%s-instance-%s", related ? "related-" : "", class, instance); + filtname = g_strdup_printf("%sclass-%s-instance-%s", related ? "related-" : "", class, instance); } /* downcase it */ { @@ -2378,7 +2378,7 @@ char *owl_function_zuserfilt(const char *longuser) /* name for the filter */ shortuser = short_zuser(longuser); - filtname = owl_sprintf("user-%s", shortuser); + filtname = g_strdup_printf("user-%s", shortuser); g_free(shortuser); /* if it already exists then go with it. This lets users override */ @@ -2424,7 +2424,7 @@ char *owl_function_aimuserfilt(const char *user) char *escuser; /* name for the filter */ - filtname=owl_sprintf("aimuser-%s", user); + filtname=g_strdup_printf("aimuser-%s", user); /* if it already exists then go with it. This lets users override */ if (owl_global_get_filter(&g, filtname)) { @@ -2434,7 +2434,7 @@ char *owl_function_aimuserfilt(const char *user) /* create the new-internal filter */ escuser = owl_text_quote(user, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH); - argbuff = owl_sprintf( + argbuff = g_strdup_printf( "( type ^aim$ and ( ( sender ^%1$s$ and recipient ^%2$s$ ) or " "( sender ^%2$s$ and recipient ^%1$s$ ) ) )", escuser, owl_global_get_aim_screenname_for_filters(&g)); @@ -2461,7 +2461,7 @@ char *owl_function_typefilt(const char *type) char *argbuff, *filtname, *esctype; /* name for the filter */ - filtname=owl_sprintf("type-%s", type); + filtname=g_strdup_printf("type-%s", type); /* if it already exists then go with it. This lets users override */ if (owl_global_get_filter(&g, filtname)) { @@ -2520,7 +2520,7 @@ static char *owl_function_smartfilter_cc(const owl_message *m) { ccs = owl_message_get_attribute_value(m, "zephyr_ccs"); - filtname = owl_sprintf("conversation-%s", ccs); + filtname = g_strdup_printf("conversation-%s", ccs); owl_text_tr(filtname, ' ', '-'); if (owl_global_get_filter(&g, filtname)) { @@ -2762,8 +2762,8 @@ void owl_function_show_colors(void) owl_fmtext_append_normal_color(&fm, "white\n", OWL_COLOR_WHITE, OWL_COLOR_DEFAULT); for(i = 8; i < COLORS; ++i) { - char* str1 = owl_sprintf("%4i: ",i); - char* str2 = owl_sprintf("%i\n",i); + char* str1 = g_strdup_printf("%4i: ",i); + char* str2 = g_strdup_printf("%i\n",i); owl_fmtext_append_normal(&fm,str1); owl_fmtext_append_normal_color(&fm, str2, i, OWL_COLOR_DEFAULT); g_free(str1); @@ -3391,7 +3391,7 @@ void owl_function_log_err(const char *string) date=g_strdup(ctime(&now)); date[strlen(date)-1]='\0'; - buff = owl_sprintf("%s %s", date, string); + buff = g_strdup_printf("%s %s", date, string); owl_errqueue_append_err(owl_global_get_errqueue(&g), buff); diff --git a/global.c b/global.c index 86af1b33a..2e13f3de1 100644 --- a/global.c +++ b/global.c @@ -93,7 +93,7 @@ void owl_global_init(owl_global *g) { g->confdir = NULL; g->startupfile = NULL; - cd = owl_sprintf("%s/%s", g->homedir, OWL_CONFIG_DIR); + cd = g_strdup_printf("%s/%s", g->homedir, OWL_CONFIG_DIR); owl_global_set_confdir(g, cd); g_free(cd); @@ -381,7 +381,7 @@ void owl_global_set_confdir(owl_global *g, const char *cd) { g_free(g->confdir); g->confdir = g_strdup(cd); g_free(g->startupfile); - g->startupfile = owl_sprintf("%s/startup", cd); + g->startupfile = g_strdup_printf("%s/startup", cd); } const char *owl_global_get_startupfile(const owl_global *g) { @@ -964,7 +964,7 @@ FILE *owl_global_get_debug_file_handle(owl_global *g) { g->debug_file = NULL; - path = owl_sprintf("%s.%d", filename, getpid()); + path = g_strdup_printf("%s.%d", filename, getpid()); fd = open(path, O_CREAT|O_WRONLY|O_EXCL, 0600); g_free(path); diff --git a/keymap.c b/keymap.c index 2ba94092f..fdf8c65a6 100644 --- a/keymap.c +++ b/keymap.c @@ -84,7 +84,7 @@ int owl_keymap_remove_binding(owl_keymap *km, const char *keyseq) char *owl_keymap_summary(const owl_keymap *km) { if (!km || !km->name || !km->desc) return NULL; - return owl_sprintf("%-15s - %s", km->name, km->desc); + return g_strdup_printf("%-15s - %s", km->name, km->desc); } /* Appends details about the keymap to fm */ diff --git a/logging.c b/logging.c index 9eb0d062b..faa45ea72 100644 --- a/logging.c +++ b/logging.c @@ -148,13 +148,13 @@ void owl_log_outgoing(const owl_message *m) to = short_zuser(owl_message_get_recipient(m)); } else if (owl_message_is_type_jabber(m)) { - to = owl_sprintf("jabber:%s", owl_message_get_recipient(m)); + to = g_strdup_printf("jabber:%s", owl_message_get_recipient(m)); owl_text_tr(to, '/', '_'); } else if (owl_message_is_type_aim(m)) { char *temp2; temp = owl_aim_normalize_screenname(owl_message_get_recipient(m)); temp2 = g_utf8_strdown(temp,-1); - to = owl_sprintf("aim:%s", temp2); + to = g_strdup_printf("aim:%s", temp2); g_free(temp2); g_free(temp); } else { @@ -268,16 +268,16 @@ void owl_log_incoming(const owl_message *m) char *normalto, *temp; temp = owl_aim_normalize_screenname(owl_message_get_sender(m)); normalto = g_utf8_strdown(temp, -1); - from=frombuff=owl_sprintf("aim:%s", normalto); + from=frombuff=g_strdup_printf("aim:%s", normalto); g_free(normalto); g_free(temp); } else if (owl_message_is_type_loopback(m)) { from=frombuff=g_strdup("loopback"); } else if (owl_message_is_type_jabber(m)) { if (personal) { - from=frombuff=owl_sprintf("jabber:%s",owl_message_get_sender(m)); + from=frombuff=g_strdup_printf("jabber:%s",owl_message_get_sender(m)); } else { - from=frombuff=owl_sprintf("jabber:%s",owl_message_get_recipient(m)); + from=frombuff=g_strdup_printf("jabber:%s",owl_message_get_recipient(m)); } } else { from=frombuff=g_strdup("unknown"); diff --git a/message.c b/message.c index d5852e6ab..f6a3f33dc 100644 --- a/message.c +++ b/message.c @@ -126,9 +126,9 @@ void owl_message_attributes_tofmtext(const owl_message *m, owl_fmtext *fm) { j=owl_list_get_size(&(m->attributes)); for (i=0; iattributes), i); - buff=owl_sprintf(" %-15.15s: %-35.35s\n", owl_pair_get_key(p), owl_pair_get_value(p)); + buff=g_strdup_printf(" %-15.15s: %-35.35s\n", owl_pair_get_key(p), owl_pair_get_value(p)); if(buff == NULL) { - buff=owl_sprintf(" %-15.15s: %-35.35s\n", owl_pair_get_key(p), ""); + buff=g_strdup_printf(" %-15.15s: %-35.35s\n", owl_pair_get_key(p), ""); if(buff == NULL) buff=g_strdup(" \n"); } @@ -887,7 +887,7 @@ void owl_message_create_from_znotice(owl_message *m, const ZNotice_t *n) int status; char *zcrypt; - zcrypt = owl_sprintf("%s/zcrypt", owl_get_bindir()); + zcrypt = g_strdup_printf("%s/zcrypt", owl_get_bindir()); rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status); g_free(zcrypt); diff --git a/owl.c b/owl.c index 5e2578cb0..0cc972b6f 100644 --- a/owl.c +++ b/owl.c @@ -433,7 +433,7 @@ void stderr_redirect_handler(const owl_io_dispatch *d, void *data) buf[navail] = '\0'; } - err = owl_sprintf("[stderr]\n%s", buf); + err = g_strdup_printf("[stderr]\n%s", buf); owl_function_log_err(err); g_free(err); diff --git a/perlconfig.c b/perlconfig.c index 6595dd95b..0ef10ab1b 100644 --- a/perlconfig.c +++ b/perlconfig.c @@ -149,7 +149,7 @@ SV *owl_perlconfig_message2hashref(const owl_message *m) if(!type || !*type) type = "generic"; utype = g_strdup(type); utype[0] = toupper(type[0]); - blessas = owl_sprintf("BarnOwl::Message::%s", utype); + blessas = g_strdup_printf("BarnOwl::Message::%s", utype); hr = newRV_noinc((SV*)h); stash = gv_stashpv(blessas,0); @@ -239,7 +239,7 @@ owl_message * owl_perlconfig_hashref2message(SV *msg) n->z_default_format = zstr("[zephyr created from perl]"); n->z_multinotice = zstr("[zephyr created from perl]"); n->z_num_other_fields = 0; - n->z_message = owl_sprintf("%s%c%s", owl_message_get_zsig(m), '\0', owl_message_get_body(m)); + n->z_message = g_strdup_printf("%s%c%s", owl_message_get_zsig(m), '\0', owl_message_get_body(m)); n->z_message_len = strlen(owl_message_get_zsig(m)) + strlen(owl_message_get_body(m)) + 1; } #endif @@ -403,7 +403,7 @@ char *owl_perlconfig_initperl(const char * file, int *Pargc, char ***Pargv, char /* Add the system lib path to @INC */ inc = get_av("INC", 0); - path = owl_sprintf("%s/lib", owl_get_datadir()); + path = g_strdup_printf("%s/lib", owl_get_datadir()); av_unshift(inc, 1); av_store(inc, 0, owl_new_sv(path)); g_free(path); diff --git a/util.c b/util.c index fbc394f15..7be32a218 100644 --- a/util.c +++ b/util.c @@ -284,26 +284,13 @@ char *owl_util_minutes_to_timestr(int in) run-=hours*60; if (days>0) { - out=owl_sprintf("%i d %2.2i:%2.2li", days, hours, run); + out=g_strdup_printf("%i d %2.2i:%2.2li", days, hours, run); } else { - out=owl_sprintf(" %2.2i:%2.2li", hours, run); + out=g_strdup_printf(" %2.2i:%2.2li", hours, run); } return(out); } -/* allocates memory and returns the string or null. - * caller must free the string. - */ -char *owl_sprintf(const char *fmt, ...) -{ - va_list ap; - char *ret = NULL; - va_start(ap, fmt); - ret = g_strdup_vprintf(fmt, ap); - va_end(ap); - return ret; -} - /* These are in order of their value in owl.h */ static const struct { int number; @@ -467,7 +454,7 @@ int owl_util_file_deleteline(const char *filename, const char *line, int backup) if (actual_filename == NULL) return -1; /* resolving the symlink failed, but we already logged this error */ - newfile = owl_sprintf("%s.new", actual_filename); + newfile = g_strdup_printf("%s.new", actual_filename); if ((new = fopen(newfile, "w")) == NULL) { owl_function_error("Cannot open %s (for writing): %s", actual_filename, strerror(errno)); @@ -499,7 +486,7 @@ int owl_util_file_deleteline(const char *filename, const char *line, int backup) fclose(old); if (backup) { - backupfile = owl_sprintf("%s.backup", actual_filename); + backupfile = g_strdup_printf("%s.backup", actual_filename); unlink(backupfile); if (link(actual_filename, backupfile) != 0) { owl_function_error("Cannot link %s: %s", backupfile, strerror(errno)); diff --git a/zephyr.c b/zephyr.c index b3c9dfd9e..139a9d42f 100644 --- a/zephyr.c +++ b/zephyr.c @@ -24,7 +24,7 @@ static char *owl_zephyr_dotfile(const char *name, const char *input) if (input != NULL) return g_strdup(input); else - return owl_sprintf("%s/%s", owl_global_get_homedir(&g), name); + return g_strdup_printf("%s/%s", owl_global_get_homedir(&g), name); } #ifdef HAVE_LIBZEPHYR @@ -587,7 +587,7 @@ char *owl_zephyr_get_message(const ZNotice_t *n, const owl_message *m) field3 = owl_zephyr_get_field(n, 3); field4 = owl_zephyr_get_field(n, 4); - msg = owl_sprintf("%s service on %s %s\n%s", n->z_opcode, n->z_class_inst, field3, field4); + msg = g_strdup_printf("%s service on %s %s\n%s", n->z_opcode, n->z_class_inst, field3, field4); g_free(field3); g_free(field4); if (msg) { @@ -605,7 +605,7 @@ char *owl_zephyr_get_message(const ZNotice_t *n, const owl_message *m) field4 = owl_zephyr_get_field(n, 4); field5 = owl_zephyr_get_field(n, 5); - msg = owl_sprintf("New transaction [%s] entered in %s\nFrom: %s (%s)\nSubject: %s", field1, field2, field3, field5, field4); + msg = g_strdup_printf("New transaction [%s] entered in %s\nFrom: %s (%s)\nSubject: %s", field1, field2, field3, field5, field4); g_free(field1); g_free(field2); g_free(field3); @@ -621,7 +621,7 @@ char *owl_zephyr_get_message(const ZNotice_t *n, const owl_message *m) field1 = owl_zephyr_get_field(n, 1); - msg = owl_sprintf("MOIRA %s on %s: %s", n->z_class_inst, owl_message_get_hostname(m), field1); + msg = g_strdup_printf("MOIRA %s on %s: %s", n->z_class_inst, owl_message_get_hostname(m), field1); g_free(field1); if (msg) { return msg; @@ -881,9 +881,9 @@ void owl_zephyr_zaway(const owl_message *m) myuser=short_zuser(to); if (!strcasecmp(owl_message_get_instance(m), "personal")) { - tmpbuff = owl_sprintf("zwrite %s", myuser); + tmpbuff = g_strdup_printf("zwrite %s", myuser); } else { - tmpbuff = owl_sprintf("zwrite -i %s %s", owl_message_get_instance(m), myuser); + tmpbuff = g_strdup_printf("zwrite -i %s %s", owl_message_get_instance(m), myuser); } g_free(myuser); g_free(to); @@ -926,17 +926,17 @@ char *owl_zephyr_zlocate(const char *user, int auth) ZResetAuthentication(); ret = ZLocateUser(zstr(user), &numlocs, auth ? ZAUTH : ZNOAUTH); if (ret != ZERR_NONE) - return owl_sprintf("Error locating user %s: %s\n", - user, error_message(ret)); + return g_strdup_printf("Error locating user %s: %s\n", + user, error_message(ret)); myuser = short_zuser(user); if (numlocs == 0) { - result = owl_sprintf("%s: Hidden or not logged in\n", myuser); + result = g_strdup_printf("%s: Hidden or not logged in\n", myuser); } else { result = g_strdup(""); for (; numlocs; numlocs--) { ZGetLocations(&locations, &one); - p = owl_sprintf("%s%s: %s\t%s\t%s\n", + p = g_strdup_printf("%s%s: %s\t%s\t%s\n", result, myuser, locations.host ? locations.host : "?", locations.tty ? locations.tty : "?", @@ -1016,7 +1016,7 @@ void owl_zephyr_delsub(const char *filename, const char *class, const char *inst /* caller must free the return */ char *owl_zephyr_makesubline(const char *class, const char *inst, const char *recip) { - return owl_sprintf("%s,%s,%s\n", class, inst, !strcmp(recip, "") ? "*" : recip); + return g_strdup_printf("%s,%s,%s\n", class, inst, !strcmp(recip, "") ? "*" : recip); } @@ -1145,10 +1145,10 @@ char *owl_zephyr_getsubs(void) return g_strdup("Error while getting subscriptions\n"); } else { /* g_string_append_printf would be backwards. */ - char *tmp = owl_sprintf("<%s,%s,%s>\n", - sub.zsub_class, - sub.zsub_classinst, - sub.zsub_recipient); + char *tmp = g_strdup_printf("<%s,%s,%s>\n", + sub.zsub_class, + sub.zsub_classinst, + sub.zsub_recipient); g_string_prepend(buf, tmp); g_free(tmp); } @@ -1202,7 +1202,7 @@ char *long_zuser(const char *in) if (strchr(in, '@')) { return(g_strdup(in)); } - return(owl_sprintf("%s@%s", in, owl_zephyr_get_realm())); + return(g_strdup_printf("%s@%s", in, owl_zephyr_get_realm())); } /* strip out the instance from a zsender's principal. Preserves the diff --git a/zwrite.c b/zwrite.c index 08f595f8d..852e2dfff 100644 --- a/zwrite.c +++ b/zwrite.c @@ -175,7 +175,7 @@ void owl_zwrite_send_ping(const owl_zwrite *z) j=owl_list_get_size(&(z->recips)); for (i=0; irealm, "")) { - to = owl_sprintf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm); + to = g_strdup_printf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm); } else { to = g_strdup(owl_list_get_element(&(z->recips), i)); } @@ -206,16 +206,16 @@ void owl_zwrite_set_message(owl_zwrite *z, const char *msg) for (i=0; irealm, "")) { - toline = owl_sprintf( "%s%s@%s ", toline, (const char *) owl_list_get_element(&(z->recips), i), z->realm); + toline = g_strdup_printf( "%s%s@%s ", toline, (const char *) owl_list_get_element(&(z->recips), i), z->realm); } else { - toline = owl_sprintf( "%s%s ", toline, (const char *) owl_list_get_element(&(z->recips), i)); + toline = g_strdup_printf( "%s%s ", toline, (const char *) owl_list_get_element(&(z->recips), i)); } g_free(tmp); tmp = NULL; } tmp = owl_validate_utf8(msg); tmp2 = owl_text_expand_tabs(tmp); - z->message=owl_sprintf("%s\n%s", toline, tmp2); + z->message=g_strdup_printf("%s\n%s", toline, tmp2); g_free(toline); g_free(tmp); g_free(tmp2); @@ -249,7 +249,7 @@ int owl_zwrite_send_message(const owl_zwrite *z) if (j>0) { for (i=0; irealm, "")) { - to = owl_sprintf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm); + to = g_strdup_printf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm); } else { to = g_strdup( owl_list_get_element(&(z->recips), i)); } @@ -261,7 +261,7 @@ int owl_zwrite_send_message(const owl_zwrite *z) to = NULL; } } else { - to = owl_sprintf( "@%s", z->realm); + to = g_strdup_printf( "@%s", z->realm); ret = send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, z->message); } g_free(to);