diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/database/database.cpp | 8 | ||||
| -rw-r--r-- | src/modules/database/dbini.cpp | 38 | ||||
| -rw-r--r-- | src/modules/database/dbintf.cpp | 86 | ||||
| -rw-r--r-- | src/modules/database/dblists.cpp | 37 | ||||
| -rw-r--r-- | src/modules/database/dbutils.cpp | 4 | ||||
| -rw-r--r-- | src/modules/database/mdatabasecache.cpp | 6 | ||||
| -rw-r--r-- | src/modules/database/profilemanager.cpp | 14 | 
7 files changed, 119 insertions, 74 deletions
diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp index a1c4514092..1a7f10395f 100644 --- a/src/modules/database/database.cpp +++ b/src/modules/database/database.cpp @@ -132,7 +132,7 @@ static void getDefaultProfile(TCHAR *szProfile, size_t cch, TCHAR *profiledir)  // returns 1 if something that looks like a profile is there
  static void loadProfileByShortName(const TCHAR* src, TCHAR *szProfile, size_t cch, TCHAR *profiledir)
 -{	
 +{
  	TCHAR buf[MAX_PATH];
  	_tcsncpy(buf, src, SIZEOF(buf));
 @@ -263,8 +263,7 @@ static int getProfile1(TCHAR *szProfile, size_t cch, TCHAR *profiledir, BOOL * n  						if (++found == 1 && nodprof)
  							_tcscpy(szProfile, newProfile);
  				}
 -			}
 -				while (FindNextFile(hFind, &ffd));
 +			} while (FindNextFile(hFind, &ffd));
  			FindClose(hFind);
  		}
 @@ -523,8 +522,7 @@ int LoadDatabaseModule(void)  				retry = MessageBox(0, buf, TranslateT("Miranda can't open that profile"), MB_RETRYCANCEL | MB_ICONERROR) == IDRETRY;
  			}
  		}
 -	}
 -		while (retry);
 +	} while (retry);
  	if (rc == ERROR_SUCCESS) {
  		InitIni();
 diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp index f43e0ac733..2d148f146c 100644 --- a/src/modules/database/dbini.cpp +++ b/src/modules/database/dbini.cpp @@ -35,7 +35,7 @@ static INT_PTR CALLBACK InstallIniDlgProc(HWND hwndDlg, UINT message, WPARAM wPa  		case WM_INITDIALOG:
  			TranslateDialogDefault(hwndDlg);
  			SetDlgItemText(hwndDlg, IDC_ININAME, (TCHAR*)lParam);
 -			{	
 +			{
  				TCHAR szSecurity[11];
  				const TCHAR *pszSecurityInfo;
 @@ -54,7 +54,8 @@ static INT_PTR CALLBACK InstallIniDlgProc(HWND hwndDlg, UINT message, WPARAM wPa  		case WM_COMMAND:
  			switch(LOWORD(wParam)) {
  				case IDC_VIEWINI:
 -				{	TCHAR szPath[MAX_PATH];
 +				{
 +					TCHAR szPath[MAX_PATH];
  					GetDlgItemText(hwndDlg, IDC_ININAME, szPath, SIZEOF(szPath));
  					ShellExecute(hwndDlg, _T("open"), szPath, NULL, NULL, SW_SHOW);
  					break;
 @@ -84,7 +85,8 @@ static bool IsInSpaceSeparatedList(const char *szWord, const char *szList)  				return true;
  		}
  		szItem = szEnd+1;
 -}	}
 +	}
 +}
  struct warnSettingChangeInfo_t {
  	TCHAR *szIniPath;
 @@ -102,7 +104,8 @@ static INT_PTR CALLBACK WarnIniChangeDlgProc(HWND hwndDlg, UINT message, WPARAM  	switch(message) {
  		case WM_INITDIALOG:
 -		{	char szSettingName[256];
 +		{
 +			char szSettingName[256];
  			const TCHAR *pszSecurityInfo;
  			warnInfo = (warnSettingChangeInfo_t*)lParam;
  			TranslateDialogDefault(hwndDlg);
 @@ -145,7 +148,8 @@ static INT_PTR CALLBACK IniImportDoneDlgProc(HWND hwndDlg, UINT message, WPARAM  			SetDlgItemText(hwndDlg, IDC_NEWNAME, (TCHAR*)lParam);
  			return TRUE;
  		case WM_COMMAND:
 -		{	TCHAR szIniPath[MAX_PATH];
 +		{
 +			TCHAR szIniPath[MAX_PATH];
  			GetDlgItemText(hwndDlg, IDC_ININAME, szIniPath, SIZEOF(szIniPath));
  			switch(LOWORD(wParam)) {
  				case IDC_DELETE:
 @@ -154,7 +158,8 @@ static INT_PTR CALLBACK IniImportDoneDlgProc(HWND hwndDlg, UINT message, WPARAM  					EndDialog(hwndDlg, LOWORD(wParam));
  					break;
  				case IDC_RECYCLE:
 -					{	SHFILEOPSTRUCT shfo = {0};
 +					{
 +						SHFILEOPSTRUCT shfo = {0};
  						shfo.wFunc = FO_DELETE;
  						shfo.pFrom = szIniPath;
  						szIniPath[lstrlen(szIniPath)+1] = '\0';
 @@ -164,7 +169,8 @@ static INT_PTR CALLBACK IniImportDoneDlgProc(HWND hwndDlg, UINT message, WPARAM  					EndDialog(hwndDlg, LOWORD(wParam));
  					break;
  				case IDC_MOVE:
 -					{	TCHAR szNewPath[MAX_PATH];
 +					{
 +						TCHAR szNewPath[MAX_PATH];
  						GetDlgItemText(hwndDlg, IDC_NEWNAME, szNewPath, SIZEOF(szNewPath));
  						MoveFile(szIniPath, szNewPath);
  					}
 @@ -205,7 +211,9 @@ static void ConvertBackslashes(char *str, UINT fileCp)  			default:  *pstr = pstr[1]; break;
  			}
  			memmove(pstr+1, pstr+2, strlen(pstr+2) + 1);
 -}	}	}
 +		}
 +	}
 +}
  static void ProcessIniFile(TCHAR* szIniPath, char *szSafeSections, char *szUnsafeSections, int secur, bool secFN)
  {
 @@ -218,14 +226,14 @@ static void ProcessIniFile(TCHAR* szIniPath, char *szSafeSections, char *szUnsaf  	while ( !feof(fp)) {
  		char szLine[2048];
 -		if (fgets(szLine, sizeof(szLine), fp) == NULL) 
 +		if (fgets(szLine, sizeof(szLine), fp) == NULL)
  			break;
  		int lineLength = lstrlenA(szLine);
  		while (lineLength && (BYTE)(szLine[lineLength-1]) <= ' ')
  			szLine[--lineLength] = '\0';
 -		if (szLine[0] == ';' || szLine[0] <= ' ') 
 +		if (szLine[0] == ';' || szLine[0] <= ' ')
  			continue;
  		if (szLine[0] == '[') {
 @@ -333,7 +341,8 @@ static void ProcessIniFile(TCHAR* szIniPath, char *szSafeSections, char *szUnsaf  			break;
  		case 'g':
  		case 'G':
 -			{	char *pstr;
 +			{
 +				char *pstr;
  				for (pstr = szValue+1;*pstr;pstr++) {
  					if (*pstr == '\\') {
  						switch(pstr[1]) {
 @@ -343,7 +352,9 @@ static void ProcessIniFile(TCHAR* szIniPath, char *szSafeSections, char *szUnsaf  						default:  *pstr = pstr[1]; break;
  						}
  						MoveMemory(pstr+1, pstr+2, lstrlenA(pstr+2)+1);
 -			}	}	}
 +					}
 +				}
 +			}
  		case 'u':
  		case 'U':
  			DBWriteContactSettingStringUtf(NULL, szSection, szName, szValue+1);
 @@ -352,7 +363,8 @@ static void ProcessIniFile(TCHAR* szIniPath, char *szSafeSections, char *szUnsaf  		case 'h':
  		case 'N':
  		case 'H':
 -			{	PBYTE buf;
 +			{
 +				PBYTE buf;
  				int len;
  				char *pszValue, *pszEnd;
  				DBCONTACTWRITESETTING cws;
 diff --git a/src/modules/database/dbintf.cpp b/src/modules/database/dbintf.cpp index da83e284d2..e3065d471b 100644 --- a/src/modules/database/dbintf.cpp +++ b/src/modules/database/dbintf.cpp @@ -38,127 +38,155 @@ static INT_PTR srvSetSafetyMode(WPARAM wParam, LPARAM)  }
  static INT_PTR srvGetContactCount(WPARAM, LPARAM)
 -{	return (currDb) ? currDb->GetContactCount() : 0;
 +{
 +	return (currDb) ? currDb->GetContactCount() : 0;
  }
  ///////////////////////////////////////////////////////////////////////////////
  // Contacts
  static INT_PTR srvFindFirstContact(WPARAM, LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->FindFirstContact((LPCSTR)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->FindFirstContact((LPCSTR)lParam) : 0;
  }
  static INT_PTR srvFindNextContact(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->FindNextContact((HANDLE)wParam, (LPCSTR)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->FindNextContact((HANDLE)wParam, (LPCSTR)lParam) : 0;
  }
  static INT_PTR srvDeleteContact(WPARAM wParam, LPARAM)
 -{	return (currDb) ? currDb->DeleteContact((HANDLE)wParam) : 0;
 +{
 +	return (currDb) ? currDb->DeleteContact((HANDLE)wParam) : 0;
  }
  static INT_PTR srvAddContact(WPARAM wParam, LPARAM)
 -{	return (currDb) ? (INT_PTR)currDb->AddContact() : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->AddContact() : 0;
  }
  static INT_PTR srvIsDbContact(WPARAM wParam, LPARAM)
 -{	return (currDb) ? currDb->IsDbContact((HANDLE)wParam) : 0;
 +{
 +	return (currDb) ? currDb->IsDbContact((HANDLE)wParam) : 0;
  }
  ///////////////////////////////////////////////////////////////////////////////
  // Events
  static INT_PTR srvGetEventCount(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? currDb->GetEventCount((HANDLE)wParam) : 0;
 +{
 +	return (currDb) ? currDb->GetEventCount((HANDLE)wParam) : 0;
  }
  static INT_PTR srvAddEvent(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->AddEvent((HANDLE)wParam, (DBEVENTINFO*)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->AddEvent((HANDLE)wParam, (DBEVENTINFO*)lParam) : 0;
  }
  static INT_PTR srvDeleteEvent(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? currDb->DeleteEvent((HANDLE)wParam, (HANDLE)lParam) : 0;
 +{
 +	return (currDb) ? currDb->DeleteEvent((HANDLE)wParam, (HANDLE)lParam) : 0;
  }
  static INT_PTR srvGetBlobSize(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? currDb->GetBlobSize((HANDLE)wParam) : 0;
 +{
 +	return (currDb) ? currDb->GetBlobSize((HANDLE)wParam) : 0;
  }
  static INT_PTR srvGetEvent(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->GetEvent((HANDLE)wParam, (DBEVENTINFO*)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->GetEvent((HANDLE)wParam, (DBEVENTINFO*)lParam) : 0;
  }
  static INT_PTR srvMarkEventRead(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? currDb->MarkEventRead((HANDLE)wParam, (HANDLE)lParam) : 0;
 +{
 +	return (currDb) ? currDb->MarkEventRead((HANDLE)wParam, (HANDLE)lParam) : 0;
  }
  static INT_PTR srvGetEventContact(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->GetEventContact((HANDLE)wParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->GetEventContact((HANDLE)wParam) : 0;
  }
  static INT_PTR srvFindFirstEvent(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->FindFirstEvent((HANDLE)wParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->FindFirstEvent((HANDLE)wParam) : 0;
  }
  static INT_PTR srvFindFirstUnreadEvent(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->FindFirstUnreadEvent((HANDLE)wParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->FindFirstUnreadEvent((HANDLE)wParam) : 0;
  }
  static INT_PTR srvFindLastEvent(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->FindLastEvent((HANDLE)wParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->FindLastEvent((HANDLE)wParam) : 0;
  }
  static INT_PTR srvFindNextEvent(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->FindNextEvent((HANDLE)wParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->FindNextEvent((HANDLE)wParam) : 0;
  }
  static INT_PTR srvFindPrevEvent(WPARAM wParam, LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->FindPrevEvent((HANDLE)wParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->FindPrevEvent((HANDLE)wParam) : 0;
  }
  ///////////////////////////////////////////////////////////////////////////////
  // Module chain
  static INT_PTR srvEnumModuleNames(WPARAM wParam,LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->EnumModuleNames((DBMODULEENUMPROC)lParam, (void*)wParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->EnumModuleNames((DBMODULEENUMPROC)lParam, (void*)wParam) : 0;
  }
  ///////////////////////////////////////////////////////////////////////////////
  // Settings
  static INT_PTR srvGetContactSetting(WPARAM wParam,LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->GetContactSetting((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->GetContactSetting((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
  }
  static INT_PTR srvGetContactSettingStr(WPARAM wParam,LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->GetContactSettingStr((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->GetContactSettingStr((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
  }
  static INT_PTR srvGetContactSettingStatic(WPARAM wParam,LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->GetContactSettingStatic((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->GetContactSettingStatic((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
  }
  static INT_PTR srvFreeVariant(WPARAM wParam,LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->FreeVariant((DBVARIANT*)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->FreeVariant((DBVARIANT*)lParam) : 0;
  }
  static INT_PTR srvWriteContactSetting(WPARAM wParam,LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->WriteContactSetting((HANDLE)wParam, (DBCONTACTWRITESETTING*)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->WriteContactSetting((HANDLE)wParam, (DBCONTACTWRITESETTING*)lParam) : 0;
  }
  static INT_PTR srvDeleteContactSetting(WPARAM wParam,LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->DeleteContactSetting((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->DeleteContactSetting((HANDLE)wParam, (DBCONTACTGETSETTING*)lParam) : 0;
  }
  static INT_PTR srvEnumContactSettings(WPARAM wParam,LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->EnumContactSettings((HANDLE)wParam, (DBCONTACTENUMSETTINGS*)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->EnumContactSettings((HANDLE)wParam, (DBCONTACTENUMSETTINGS*)lParam) : 0;
  }
  static INT_PTR srvSetSettingResident(WPARAM wParam,LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->SetSettingResident(wParam, (char*)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->SetSettingResident(wParam, (char*)lParam) : 0;
  }
  static INT_PTR srvEnumResidentSettings(WPARAM wParam,LPARAM lParam)
 -{	return (currDb) ? (INT_PTR)currDb->EnumResidentSettings((DBMODULEENUMPROC)wParam, (void*)lParam) : 0;
 +{
 +	return (currDb) ? (INT_PTR)currDb->EnumResidentSettings((DBMODULEENUMPROC)wParam, (void*)lParam) : 0;
  }
  ///////////////////////////////////////////////////////////////////////////////
 @@ -215,7 +243,7 @@ static INT_PTR srvDestroyInstance(WPARAM wParam,LPARAM lParam)  int LoadDbintfModule()
  {
  	CreateServiceFunction(MS_DB_SETSAFETYMODE, srvSetSafetyMode);
 -	
 +
  	CreateServiceFunction(MS_DB_CONTACT_GETCOUNT, srvGetContactCount);
  	CreateServiceFunction(MS_DB_CONTACT_FINDFIRST, srvFindFirstContact);
  	CreateServiceFunction(MS_DB_CONTACT_FINDNEXT, srvFindNextContact);
 diff --git a/src/modules/database/dblists.cpp b/src/modules/database/dblists.cpp index bd1d352641..91b657eab3 100644 --- a/src/modules/database/dblists.cpp +++ b/src/modules/database/dblists.cpp @@ -52,7 +52,7 @@ void List_Destroy(SortedList* p_list)  void* List_Find(SortedList* p_list, void* p_value)
  {
  	int index;
 -	
 +
  	if ( !List_GetIndex(p_list, p_value, &index))
  		return(NULL);
 @@ -84,11 +84,11 @@ int List_GetIndex(SortedList* p_list, void* p_value, int* p_index)  			int high = p_list->realCount - 1;
  			while (low <= high)
 -			{  
 +			{
  				int i = (low + high) / 2;
  				unsigned __int64 vali = *(unsigned __int64 *)p_list->items[i];
  				if (vali == val)
 -				{	
 +				{
  					*p_index = i;
  					return 1;
  				}
 @@ -111,11 +111,11 @@ int List_GetIndex(SortedList* p_list, void* p_value, int* p_index)  			int high = p_list->realCount - 1;
  			while (low <= high)
 -			{  
 +			{
  				int i = (low + high) / 2;
  				unsigned vali = *(unsigned *)p_list->items[i];
  				if (vali == val)
 -				{	
 +				{
  					*p_index = i;
  					return 1;
  				}
 @@ -136,11 +136,11 @@ int List_GetIndex(SortedList* p_list, void* p_value, int* p_index)  			int high = p_list->realCount - 1;
  			while (low <= high)
 -			{  
 +			{
  				int i = (low + high) / 2;
  				const void* vali = p_list->items[i];
  				if (vali == p_value)
 -				{	
 +				{
  					*p_index = i;
  					return 1;
  				}
 @@ -161,11 +161,11 @@ int List_GetIndex(SortedList* p_list, void* p_value, int* p_index)  			int high = p_list->realCount - 1;
  			while (low <= high)
 -			{  
 +			{
  				int i = (low + high) / 2;
  				int result = p_list->sortFunc(p_list->items[i], p_value);
  				if (result == 0)
 -				{	
 +				{
  					*p_index = i;
  					return 1;
  				}
 @@ -206,7 +206,7 @@ int List_Insert(SortedList* p_list, void* p_value, int p_index)  	if (p_value == NULL || p_index > p_list->realCount)
  		return 0;
 -   if (p_list->realCount == p_list->limit)
 +	if (p_list->realCount == p_list->limit)
  	{
  		p_list->items = (void**)mir_realloc(p_list->items, sizeof(void*)*(p_list->realCount + p_list->increment));
  		p_list->limit += p_list->increment;
 @@ -215,10 +215,10 @@ int List_Insert(SortedList* p_list, void* p_value, int p_index)  	if (p_index < p_list->realCount)
  		memmove(p_list->items+p_index+1, p_list->items+p_index, sizeof(void*)*(p_list->realCount-p_index));
 -   p_list->realCount++;
 +	p_list->realCount++;
 -   p_list->items[ p_index ] = p_value;
 -   return 1;
 +	p_list->items[ p_index ] = p_value;
 +	return 1;
  }
  int List_InsertPtr(SortedList* list, void* p)
 @@ -236,14 +236,14 @@ int List_Remove(SortedList* p_list, int index)  	if (index < 0 || index > p_list->realCount)
  		return(0);
 -   p_list->realCount--;
 -   if (p_list->realCount > index)
 +	p_list->realCount--;
 +	if (p_list->realCount > index)
  	{
  		memmove(p_list->items+index, p_list->items+index+1, sizeof(void*)*(p_list->realCount-index));
 -      p_list->items[ p_list->realCount ] = NULL;
 +		p_list->items[ p_list->realCount ] = NULL;
  	}
 -   return 1;
 +	return 1;
  }
  int List_RemovePtr(SortedList* list, void* p)
 @@ -275,4 +275,5 @@ void List_ObjCopy(SortedList* s, SortedList* d, size_t itemSize)  		void* item = new char[ itemSize ];
  		memcpy(item, s->items[i], itemSize);
  		List_Insert(d, item, i);
 -}	}
 +	}
 +}
 diff --git a/src/modules/database/dbutils.cpp b/src/modules/database/dbutils.cpp index 174d7e5109..93a9a23eb8 100644 --- a/src/modules/database/dbutils.cpp +++ b/src/modules/database/dbutils.cpp @@ -137,7 +137,9 @@ static INT_PTR DbEventGetText(WPARAM wParam, LPARAM lParam)  					if (p[i] == 0) {
  						msglenW = i;
  						break;
 -			}	}	}
 +					}
 +				}
 +			}
  			if (msglenW > 0 && msglenW < msglen && !bIsDenyUnicode)
  				msg = mir_wstrdup((WCHAR*)&dbei->pBlob[ msglen ]);
 diff --git a/src/modules/database/mdatabasecache.cpp b/src/modules/database/mdatabasecache.cpp index b5b103461b..fca9670f27 100644 --- a/src/modules/database/mdatabasecache.cpp +++ b/src/modules/database/mdatabasecache.cpp @@ -25,11 +25,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.  #include "database.h"
  static int stringCompare(const char* p1, const char* p2)
 -{	return strcmp(p1, p2);
 +{
 +	return strcmp(p1, p2);
  }
  static int compareGlobals(const DBCachedGlobalValue* p1, const DBCachedGlobalValue* p2)
 -{	return strcmp(p1->name, p2->name);
 +{
 +	return strcmp(p1->name, p2->name);
  }
  MDatabaseCache::MDatabaseCache() :
 diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp index e7b1898b2c..49cc0ae72f 100644 --- a/src/modules/database/profilemanager.cpp +++ b/src/modules/database/profilemanager.cpp @@ -204,7 +204,9 @@ static INT_PTR CALLBACK DlgProfileNew(HWND hwndDlg, UINT msg, WPARAM wParam, LPA  				if (makeDatabase(dat->pd->szProfile, dat->pd->dblink, hwndDlg) == 0) {
  					SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE);
 -		}	}	}
 +				}
 +			}
 +		}
  		break;
  	}
 @@ -292,7 +294,7 @@ void CheckProfile(HWND hwndList, int iItem, DlgProfData *dat)  {
  	if (iItem < 0)
  		return;
 -	
 +
  	TCHAR profile[MAX_PATH], fullName[MAX_PATH];
  	LVITEM item = {0};
  	item.mask = LVIF_TEXT;
 @@ -492,7 +494,7 @@ static INT_PTR CALLBACK DlgProfileSelect(HWND hwndDlg, UINT msg, WPARAM wParam,  							CloseHandle(hFile);
  							if (hdr->code == NM_DBLCLK) EndDialog(GetParent(hwndDlg), 1);
  						}
 -					}	
 +					}
  					return TRUE;
  				case LVN_KEYDOWN:
 @@ -502,7 +504,7 @@ static INT_PTR CALLBACK DlgProfileSelect(HWND hwndDlg, UINT msg, WPARAM wParam,  							DeleteProfile(hwndList, ListView_GetNextItem(hwndList, -1, LVNI_SELECTED | LVNI_ALL), dat);
  						break;
  					}
 -				}	
 +				}
  			}
  			break;
  		}
 @@ -605,7 +607,7 @@ static INT_PTR CALLBACK DlgProfileManager(HWND hwndDlg, UINT msg, WPARAM wParam,  		return TRUE;
  	case PSM_FORCECHANGED:
 -		{	
 +		{
  			PSHNOTIFY pshn;
  			pshn.hdr.code = PSN_INFOCHANGED;
  			pshn.hdr.idFrom = 0;
 @@ -674,7 +676,7 @@ static INT_PTR CALLBACK DlgProfileManager(HWND hwndDlg, UINT msg, WPARAM wParam,  				for (int i=0; i < dat->pageCount; i++) {
  					if (dat->opd[i].hwnd == NULL || !dat->opd[i].changed)
  						continue;
 -					
 +
  					pshn.hdr.hwndFrom = dat->opd[i].hwnd;
  					SendMessage(dat->opd[i].hwnd, WM_NOTIFY, 0, (LPARAM)&pshn);
  				}
  | 
