From 8ffc77be71507825a8f7585bcabff8ccc370206a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 8 Dec 2018 20:12:16 +0300 Subject: db_get_sa / db_get_wsa to receive the default value, massive code simplification --- plugins/AVS/src/utils.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/AVS/src') diff --git a/plugins/AVS/src/utils.cpp b/plugins/AVS/src/utils.cpp index 4e1d9ea226..844d59b956 100644 --- a/plugins/AVS/src/utils.cpp +++ b/plugins/AVS/src/utils.cpp @@ -92,10 +92,10 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz } else { if (hContact == 0) { // create a protocol picture in the proto picture cache - if (tszValue = db_get_wsa(NULL, PPICT_MODULE, szProto)) + if (tszValue = db_get_wsa(0, PPICT_MODULE, szProto)) MyPathToAbsolute(tszValue, tszFilename); else if (mir_strcmp(szProto, AVS_DEFAULT)) { - if (tszValue = db_get_wsa(NULL, PPICT_MODULE, AVS_DEFAULT)) + if (tszValue = db_get_wsa(0, PPICT_MODULE, AVS_DEFAULT)) MyPathToAbsolute(tszValue, tszFilename); if (!strstr(szProto, "Global avatar for")) { @@ -104,7 +104,7 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz return -1; char key[MAX_PATH]; mir_snprintf(key, "Global avatar for %s accounts", pdescr->szProtoName); - if (tszValue = db_get_wsa(NULL, PPICT_MODULE, key)) + if (tszValue = db_get_wsa(0, PPICT_MODULE, key)) MyPathToAbsolute(tszValue, tszFilename); } } @@ -130,7 +130,7 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz else MultiByteToWideChar(CP_ACP, 0, szFileName, -1, tszFilename, _countof(tszFilename)); } - else if (tszValue = db_get_wsa(NULL, szProto, "AvatarFile")) + else if (tszValue = db_get_wsa(0, szProto, "AvatarFile")) MyPathToAbsolute(tszValue, tszFilename); else return -1; } -- cgit v1.2.3