diff options
| author | LPFaint99 <lpfaint99@gmail.com> | 2009-03-07 08:35:01 +0000 |
|---|---|---|
| committer | LPFaint99 <lpfaint99@gmail.com> | 2009-03-07 08:35:01 +0000 |
| commit | 3f44ccb75ec43e96de483c39d2ce2cf67401a253 (patch) | |
| tree | ac73994fb07e6eda6830e65df67066e9dfe0ed83 /Source/Core/Common/Src/Misc.cpp | |
| parent | f0431631a8a384ee0ff2c8bff2690ea56bde7d3b (diff) | |
eol-style native update, small warning fix in EXI_Channel.h
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2591 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/Misc.cpp')
| -rw-r--r-- | Source/Core/Common/Src/Misc.cpp | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/Source/Core/Common/Src/Misc.cpp b/Source/Core/Common/Src/Misc.cpp index 40b7623ba5..15f79fe700 100644 --- a/Source/Core/Common/Src/Misc.cpp +++ b/Source/Core/Common/Src/Misc.cpp @@ -1,60 +1,60 @@ -// Copyright (C) 2003-2008 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// 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 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-#include "Common.h"
-
-// Generic function to get last error message.
-// Call directly after the command or use the error num.
-// This function might change the error code.
-const char *GetLastErrorMsg()
-{
- // FIXME : not thread safe.
- // Caused by sloppy use in logging in FileUtil.cpp, primarily. What to do, what to do ...
- static char errStr[255] = {0};
-#ifdef _WIN32
- DWORD dw = GetLastError();
- FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dw,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) errStr, 254, NULL );
-#else
- // Thread safe (XSI-compliant)
- strerror_r(errno, errStr, 255);
-#endif
- return errStr;
-}
-
-#ifdef __APPLE__
-// strlen with cropping after size n
-size_t strnlen(const char *s, size_t n)
-{
- const char *p = (const char *)memchr(s, 0, n);
- return(p ? p-s : n);
-}
-#endif
-
-// strdup with cropping after size n
-char* strndup(char const *s, size_t n)
-{
- size_t len = strnlen(s, n);
- char *dup = (char *)malloc(len + 1);
-
- if (dup == NULL)
- return NULL;
-
- dup[len] = '\0';
- return (char *)memcpy(dup, s, len);
-}
+// Copyright (C) 2003-2008 Dolphin Project. + +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 2.0. + +// 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 2.0 for more details. + +// A copy of the GPL 2.0 should have been included with the program. +// If not, see http://www.gnu.org/licenses/ + +// Official SVN repository and contact information can be found at +// http://code.google.com/p/dolphin-emu/ + +#include "Common.h" + +// Generic function to get last error message. +// Call directly after the command or use the error num. +// This function might change the error code. +const char *GetLastErrorMsg() +{ + // FIXME : not thread safe. + // Caused by sloppy use in logging in FileUtil.cpp, primarily. What to do, what to do ... + static char errStr[255] = {0}; +#ifdef _WIN32 + DWORD dw = GetLastError(); + FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dw, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) errStr, 254, NULL ); +#else + // Thread safe (XSI-compliant) + strerror_r(errno, errStr, 255); +#endif + return errStr; +} + +#ifdef __APPLE__ +// strlen with cropping after size n +size_t strnlen(const char *s, size_t n) +{ + const char *p = (const char *)memchr(s, 0, n); + return(p ? p-s : n); +} +#endif + +// strdup with cropping after size n +char* strndup(char const *s, size_t n) +{ + size_t len = strnlen(s, n); + char *dup = (char *)malloc(len + 1); + + if (dup == NULL) + return NULL; + + dup[len] = '\0'; + return (char *)memcpy(dup, s, len); +} |
