summaryrefslogtreecommitdiff
path: root/plugins/SendScreenshotPlus/src/mir_string.h
diff options
context:
space:
mode:
authorRené Schümann <white06tiger@gmail.com>2014-04-03 01:46:29 +0000
committerRené Schümann <white06tiger@gmail.com>2014-04-03 01:46:29 +0000
commita58626275cfecfeae65ffb94e006483b1e344fde (patch)
tree39ef8a9a30974cdebd483201dd3e12ef255ccca1 /plugins/SendScreenshotPlus/src/mir_string.h
parent3ff89e16119e063eb5719679e7b34d306116b265 (diff)
SendSS: updated files imported from UserInfoEx (mir_string,mir_icolib,dlg_msgbox)
* renamed IDI_ constants to reflect UserInfoEx style * use Skin_GetIcon() directly instead of IcoLib_GetIcon() git-svn-id: http://svn.miranda-ng.org/main/trunk@8832 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SendScreenshotPlus/src/mir_string.h')
-rw-r--r--plugins/SendScreenshotPlus/src/mir_string.h27
1 files changed, 16 insertions, 11 deletions
diff --git a/plugins/SendScreenshotPlus/src/mir_string.h b/plugins/SendScreenshotPlus/src/mir_string.h
index 95ab3496f1..a8dc50e776 100644
--- a/plugins/SendScreenshotPlus/src/mir_string.h
+++ b/plugins/SendScreenshotPlus/src/mir_string.h
@@ -1,5 +1,4 @@
/*
-
Miranda NG: the free IM client for Microsoft* Windows*
Copyright (c) 2012-14 Miranda NG project (http://miranda-ng.org),
@@ -18,8 +17,8 @@ of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
@@ -29,16 +28,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef _MIR_STRING_H_INCLUDED_
#define _MIR_STRING_H_INCLUDED_
-#define mir_tcsadd mir_wcsadd
-#define mir_tcsncpy mir_wcsncpy
-#define mir_tcsncat mir_wcsncat
+#define mir_tcslen mir_wcslen
+#define mir_tcsadd mir_wcsadd
+#define mir_tcsncpy mir_wcsncpy
+#define mir_tcsncat mir_wcsncat
+
+#define mir_strlen(s) (((s)!=0)?strlen(s):0)
+#define mir_strcpy(d,s) (((s)!=0&&(d)!=0)?strcpy(d,s):0)
+
+#define mir_wcslen(s) (((s)!=0)?wcslen(s):0)
-#define mir_freeAndNil(ptr) {if(ptr) mir_free(ptr); ptr = NULL;}
+#define mir_freeAndNil(ptr) mir_free(ptr),ptr=NULL
-wchar_t* mir_wcsncpy(wchar_t *pszDest, const wchar_t *pszSrc, const size_t cchDest);
-wchar_t* mir_wcsncat(wchar_t *pszDest, const wchar_t *pszSrc, const size_t cchDest);
+wchar_t* mir_wcsncpy(wchar_t* pszDest, const wchar_t* pszSrc, const size_t cchDest);
+wchar_t* mir_wcsncat(wchar_t* pszDest, const wchar_t* pszSrc, const size_t cchDest);
-void mir_stradd(char * &pszDest, const char *pszSrc);
-void mir_wcsadd(wchar_t * &pszDest, const wchar_t *pszSrc);
+void mir_stradd(char* &pszDest, const char* pszSrc);
+void mir_wcsadd(wchar_t* &pszDest, const wchar_t* pszSrc);
#endif /* _MIR_STRING_H_INCLUDED_ */ \ No newline at end of file