summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/PluginUpdater/src/Compat/compat.h8
-rw-r--r--plugins/PluginUpdater/src/DlgUpdate.cpp4
-rw-r--r--plugins/PluginUpdater/src/Utils.cpp9
-rw-r--r--plugins/PluginUpdater/src/stdafx.h1
-rw-r--r--plugins/WebView/src/webview_opts.cpp11
5 files changed, 11 insertions, 22 deletions
diff --git a/plugins/PluginUpdater/src/Compat/compat.h b/plugins/PluginUpdater/src/Compat/compat.h
index 5818adcef1..4c0d0849eb 100644
--- a/plugins/PluginUpdater/src/Compat/compat.h
+++ b/plugins/PluginUpdater/src/Compat/compat.h
@@ -155,5 +155,13 @@ __forceinline TCHAR *Utils_ReplaceVarsT(const TCHAR *szData, MCONTACT hContact,
return (TCHAR*)CallService(MS_UTILS_REPLACEVARS, (WPARAM)szData, (LPARAM)&vars);
}
+void strdelt(TCHAR *parBuffer, int len)
+{
+ TCHAR* p;
+ for (p = parBuffer + len; *p != 0; p++)
+ p[-len] = *p;
+
+ p[-len] = '\0';
+}
#define _qtoupper(_c) (((_c) >= 'a' && (_c) <= 'z')?((_c)-('a'+'A')):(_c))
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index b3298611f1..cba35cebe7 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -646,13 +646,13 @@ static int ScanFolder(const TCHAR *tszFolder, size_t cbBaseLen, int level, const
// remove trailing w or W and try again
int iPos = int(p - tszNewName) - 1;
- strdel(p - 1, 1);
+ strdelt(p - 1, 1);
if ((item = hashes.find((ServListEntry*)&pName)) == NULL) {
Netlib_LogfT(hNetlibUser, _T("File %s: Not found on server, skipping"), ffd.cFileName);
continue;
}
- strdel(tszNewName + iPos, 1);
+ strdelt(tszNewName + iPos, 1);
}
#if MIRANDA_VER >= 0x0A00
diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp
index 30f212abe1..47e73a0e53 100644
--- a/plugins/PluginUpdater/src/Utils.cpp
+++ b/plugins/PluginUpdater/src/Utils.cpp
@@ -313,15 +313,6 @@ bool DownloadFile(FILEURL *pFileURL, HANDLE &nlc)
return ret;
}
-void strdel(TCHAR *parBuffer, int len)
-{
- TCHAR* p;
- for (p = parBuffer + len; *p != 0; p++)
- p[-len] = *p;
-
- p[-len] = '\0';
-}
-
void __stdcall OpenPluginOptions(void*)
{
OPENOPTIONSDIALOG ood = {0};
diff --git a/plugins/PluginUpdater/src/stdafx.h b/plugins/PluginUpdater/src/stdafx.h
index 146c1ac49c..5491dd325b 100644
--- a/plugins/PluginUpdater/src/stdafx.h
+++ b/plugins/PluginUpdater/src/stdafx.h
@@ -226,7 +226,6 @@ void CheckUpdateOnStartup();
void InitTimer(void *type);
bool unzip(const TCHAR *ptszZipFile, TCHAR *ptszDestPath, TCHAR *ptszBackPath,bool ch);
-void strdel(TCHAR *parBuffer, int len);
///////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp
index 1adf9ccb7c..b0a8f1bee3 100644
--- a/plugins/WebView/src/webview_opts.cpp
+++ b/plugins/WebView/src/webview_opts.cpp
@@ -37,15 +37,6 @@ static TCHAR *EventTypes[] = { LPGENT("A string is present"), LPGENT("The web pa
#define M_FILLSCRIPTCOMBO (WM_USER+16)
-void strdel(TCHAR *parBuffer, int len)
-{
- TCHAR* p;
- for (p = parBuffer + len; *p != 0; p++)
- p[-len] = *p;
-
- p[-len] = '\0';
-}
-
TCHAR* FixButtonText(TCHAR *url, size_t len)
{
TCHAR buttontext[256], stringbefore[256], newbuttontext[256];
@@ -62,7 +53,7 @@ TCHAR* FixButtonText(TCHAR *url, size_t len)
int pos = (stringafter - buttontext);
int posbefore = (stringafter - buttontext) - 1;
int posafter = (stringafter - buttontext) + 1;
- strdel(stringafter, 1);
+ strdelt(stringafter, 1);
_tcsncpy_s(stringbefore, pos, buttontext, _TRUNCATE);
mir_sntprintf(newbuttontext, _T("%s!!%s"), stringbefore, stringafter);