clang-format issues were found. See CONTRIBUTING.md for more information. diff --git a/renderdoc/driver/gl/gl_manager.cpp b/renderdoc/driver/gl/gl_manager.cpp index b852704..b89758e 100644 --- a/renderdoc/driver/gl/gl_manager.cpp +++ b/renderdoc/driver/gl/gl_manager.cpp @@ -84,7 +84,8 @@ void GLResourceManager::MarkFBOAttachmentsReferenced(ResourceId fboid, GLResourc { FBOCache *cache = m_FBOAttachmentsCache[fboid]; - if(!record) return; + if(!record) + return; if(!cache) { diff --git a/renderdoc/os/posix/freebsd/freebsd_process.cpp b/renderdoc/os/posix/freebsd/freebsd_process.cpp index 32511cb..a24d04b 100644 --- a/renderdoc/os/posix/freebsd/freebsd_process.cpp +++ b/renderdoc/os/posix/freebsd/freebsd_process.cpp @@ -22,10 +22,10 @@ * THE SOFTWARE. ******************************************************************************/ -#include <dlfcn.h> // for dlsym +#include <dlfcn.h> // for dlsym #include <stdlib.h> -#include <sys/types.h> #include <sys/sysctl.h> +#include <sys/types.h> #include <sys/user.h> #include <unistd.h> #include "common/common.h" @@ -33,13 +33,13 @@ #include "core/core.h" #include "os/os_specific.h" -//extern char **environ; +// extern char **environ; char **GetCurrentEnvironment() { // environ is broken: https://reviews.freebsd.org/D30842 return *(char ***)dlsym(RTLD_DEFAULT, "environ"); -// return environ; + // return environ; } rdcstr execcmd(const char *cmd) diff --git a/renderdoc/os/posix/linux/linux_hook.cpp b/renderdoc/os/posix/linux/linux_hook.cpp index e8b46f4..3148d36 100644 --- a/renderdoc/os/posix/linux/linux_hook.cpp +++ b/renderdoc/os/posix/linux/linux_hook.cpp @@ -41,7 +41,7 @@ Threading::CriticalSection libLock; #ifdef __linux__ RDOC_EXTERN_CONFIG(bool, Linux_Debug_PtraceLogging); #else -# define Linux_Debug_PtraceLogging() false +#define Linux_Debug_PtraceLogging() false #endif static std::map<rdcstr, rdcarray<FunctionLoadCallback>> libraryCallbacks; @@ -120,7 +120,7 @@ int direct_setenv(const char *name, const char *value, int overwrite); // The other variants all forward to one of those - the 'l' cases unroll the va_args first before // calling onwards -#ifndef __FreeBSD__ // TODO: environ bug +#ifndef __FreeBSD__ // TODO: environ bug #define GET_EXECL_PARAMS(has_e) \ va_list args; \ va_start(args, arg); \ @@ -199,7 +199,7 @@ __attribute__((visibility("default"))) int execvp(const char *pathname, char *co return execvpe(pathname, argv, environ); } -#endif // __FreeBSD__ +#endif // __FreeBSD__ __attribute__((visibility("default"))) int execve(const char *pathname, char *const argv[], char *const envp[])