Merge pull request #2875 from botovq/next
Avoid use of uninitialized in init_dpi_end
This commit is contained in:
commit
84394c0025
|
@ -24,6 +24,7 @@ static long init_dpi_fallback(void) {
|
||||||
*/
|
*/
|
||||||
void init_dpi(void) {
|
void init_dpi(void) {
|
||||||
xcb_xrm_database_t *database = NULL;
|
xcb_xrm_database_t *database = NULL;
|
||||||
|
char *resource = NULL;
|
||||||
|
|
||||||
if (conn == NULL) {
|
if (conn == NULL) {
|
||||||
goto init_dpi_end;
|
goto init_dpi_end;
|
||||||
|
@ -35,7 +36,6 @@ void init_dpi(void) {
|
||||||
goto init_dpi_end;
|
goto init_dpi_end;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *resource;
|
|
||||||
xcb_xrm_resource_get_string(database, "Xft.dpi", NULL, &resource);
|
xcb_xrm_resource_get_string(database, "Xft.dpi", NULL, &resource);
|
||||||
if (resource == NULL) {
|
if (resource == NULL) {
|
||||||
DLOG("Resource Xft.dpi not specified, skipping.\n");
|
DLOG("Resource Xft.dpi not specified, skipping.\n");
|
||||||
|
|
Loading…
Reference in New Issue