1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

It's g_strdup_printf(), not g_sprintf_alloc().

Browse Source 
Declare "error", and properly terminate a string.

svn path=/trunk/; revision=18054
This commit is contained in:
Guy Harris 2006-05-01 08:09:39 +00:00
parent c978ebe47c
commit 098facb0f7
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/filesystem.c
View File

@ -224,6 +224,7 @@ init_progfile_dir(const char *arg0
TCHAR prog_pathname_w[_MAX_PATH+2];
size_t progfile_dir_len;
char *prog_pathname;
DWORD error;
TCHAR *msg_w;
guchar *msg;
size_t msglen;
@ -272,7 +273,7 @@ init_progfile_dir(const char *arg0
/*
* OK, no \ - what do we do now?
*/
return g_sprintf_alloc("No \\ in executable pathname \"%s\",
return g_strdup_printf("No \\ in executable pathname \"%s\"",
prog_pathname);
}
} else {
@ -285,7 +286,7 @@ init_progfile_dir(const char *arg0
/*
* Gak. We can't format the message.
*/
return g_sprintf_alloc("GetModuleFileName failed: %u (FormatMessage failed: %u)",
return g_strdup_printf("GetModuleFileName failed: %u (FormatMessage failed: %u)",
error, GetLastError());
}
msg = utf_16to8(msg_w);
@ -299,7 +300,7 @@ init_progfile_dir(const char *arg0
msg[msglen - 1] = '\0';
msg[msglen - 2] = '\0';
}
return g_sprintf_alloc("GetModuleFileName failed: %s (%u)",
return g_strdup_printf("GetModuleFileName failed: %s (%u)",
msg, error);
}
#else