mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: Use g_strdup_printf instead of manual building a string

Browse Source 
Instead of using lot of low level function and manually allocate
the temporary string in audio_process_options use more high
level GLib function. The function is not used in hot path but to
read some initial setting.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Message-id: 20190225154335.11397-1-fziglio@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Frediano Ziglio 2019-02-25 15:43:34 +00:00 committed by Gerd Hoffmann
parent 86c7e2f4a9
commit 71f2874fc1
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
audio/audio.c
View File

@ -454,9 +454,7 @@ static void audio_print_options (const char *prefix,
static void audio_process_options (const char *prefix, static void audio_process_options (const char *prefix,
struct audio_option *opt) struct audio_option *opt)
{ {
char *optname; gchar *prefix_upper;
const char qemu_prefix[] = "QEMU_";
size_t preflen, optlen;
if (audio_bug(__func__, !prefix)) { if (audio_bug(__func__, !prefix)) {
dolog ("prefix = NULL\n"); dolog ("prefix = NULL\n");
@ -468,10 +466,10 @@ static void audio_process_options (const char *prefix,
return; return;
} }
preflen = strlen (prefix); prefix_upper = g_utf8_strup(prefix, -1);
for (; opt->name; opt++) { for (; opt->name; opt++) {
size_t len, i; char *optname;
int def; int def;
if (!opt->valp) { if (!opt->valp) {
@ -480,21 +478,7 @@ static void audio_process_options (const char *prefix,
continue; continue;
} }
len = strlen (opt->name); optname = g_strdup_printf("QEMU_%s_%s", prefix_upper, opt->name);
/* len of opt->name + len of prefix + size of qemu_prefix
* (includes trailing zero) + zero + underscore (on behalf of
* sizeof) */
optlen = len + preflen + sizeof (qemu_prefix) + 1;
optname = g_malloc (optlen);
pstrcpy (optname, optlen, qemu_prefix);
/* copy while upper-casing, including trailing zero */
for (i = 0; i <= preflen; ++i) {
optname[i + sizeof (qemu_prefix) - 1] = qemu_toupper(prefix[i]);
}
pstrcat (optname, optlen, "_");
pstrcat (optname, optlen, opt->name);
def = 1; def = 1;
switch (opt->tag) { switch (opt->tag) {
@ -532,6 +516,7 @@ static void audio_process_options (const char *prefix,
*opt->overriddenp = !def; *opt->overriddenp = !def;
g_free (optname); g_free (optname);
} }
g_free(prefix_upper);
} }
static void audio_print_settings (struct audsettings *as) static void audio_print_settings (struct audsettings *as)