jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang-format: Apply formatting

Browse Source 
Code submissions have continually suffered from formatting
inconsistencies that constantly have to be addressed.  Using
clang-format simplifies this by making code formatting more consistent,
and allows automation of the code formatting so that maintainers can
focus more on the code itself instead of code formatting.
This commit is contained in:
jp9000
2019-06-22 22:13:45 -07:00
parent 53615ee10f
commit f53df7da64
567 changed files with 34068 additions and 32903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/win-capture/load-graphics-offsets.c
View File

@@ -12,7 +12,7 @@ extern struct graphics_offsets offsets32;
extern struct graphics_offsets offsets64;
static inline bool load_offsets_from_string(struct graphics_offsets *offsets,
const char *str)
const char *str)
{
config_t *config;
@@ -46,7 +46,7 @@ static inline bool load_offsets_from_string(struct graphics_offsets *offsets,
}
static inline bool load_offsets_from_file(struct graphics_offsets *offsets,
const char *file)
const char *file)
{
char *str = os_quick_read_utf8_file(file);
bool success = false;
@@ -56,15 +56,14 @@ static inline bool load_offsets_from_file(struct graphics_offsets *offsets,
return success;
}
static inline bool config_ver_mismatch(
config_t *ver_config,
const char *section,
struct win_version_info *ver)
static inline bool config_ver_mismatch(config_t *ver_config,
const char *section,
struct win_version_info *ver)
{
struct win_version_info config_ver;
bool mismatch = false;
#define get_sub_ver(subver) \
#define get_sub_ver(subver) \
config_ver.subver = (int)config_get_int(ver_config, section, #subver); \
mismatch |= config_ver.subver != ver->subver;
@@ -79,7 +78,7 @@ static inline bool config_ver_mismatch(
}
static inline void write_config_ver(config_t *ver_config, const char *section,
struct win_version_info *ver)
struct win_version_info *ver)
{
#define set_sub_ver(subver) \
config_set_int(ver_config, section, #subver, ver->subver);
@@ -93,7 +92,7 @@ static inline void write_config_ver(config_t *ver_config, const char *section,
}
static bool get_32bit_system_dll_ver(const wchar_t *system_lib,
struct win_version_info *ver)
struct win_version_info *ver)
{
wchar_t path[MAX_PATH];
UINT ret;
@@ -104,8 +103,10 @@ static bool get_32bit_system_dll_ver(const wchar_t *system_lib,
ret = GetSystemDirectoryW(path, MAX_PATH);
#endif
if (!ret) {
blog(LOG_ERROR, "Failed to get windows 32bit system path: "
"%lu", GetLastError());
blog(LOG_ERROR,
"Failed to get windows 32bit system path: "
"%lu",
GetLastError());
return false;
}
@@ -116,8 +117,8 @@ static bool get_32bit_system_dll_ver(const wchar_t *system_lib,
bool cached_versions_match(void)
{
struct win_version_info d3d8_ver = {0};
struct win_version_info d3d9_ver = {0};
struct win_version_info d3d8_ver = {0};
struct win_version_info d3d9_ver = {0};
struct win_version_info dxgi_ver = {0};
bool ver_mismatch = false;
config_t *config;
@@ -176,12 +177,13 @@ bool load_graphics_offsets(bool is32bit, const char *config_path)
pp = os_process_pipe_create(offset_exe_path, "r");
if (!pp) {
blog(LOG_INFO, "load_graphics_offsets: Failed to start '%s'",
offset_exe.array);
offset_exe.array);
goto error;
}
for (;;) {
size_t len = os_process_pipe_read(pp, (uint8_t*)data, sizeof(data));
size_t len =
os_process_pipe_read(pp, (uint8_t *)data, sizeof(data));
if (!len)
break;
@@ -189,13 +191,15 @@ bool load_graphics_offsets(bool is32bit, const char *config_path)
}
if (dstr_is_empty(&str)) {
blog(LOG_INFO, "load_graphics_offsets: Failed to read "
"from '%s'", offset_exe.array);
blog(LOG_INFO,
"load_graphics_offsets: Failed to read "
"from '%s'",
offset_exe.array);
goto error;
}
// uncomment this if you enable USE_HOOK_ADDRESS_CACHE
/*
/*
dstr_copy(&config_ini, config_path);
dstr_cat(&config_ini, is32bit ? "32.ini" : "64.ini");
@@ -205,7 +209,7 @@ bool load_graphics_offsets(bool is32bit, const char *config_path)
*/
success = load_offsets_from_string(is32bit ? &offsets32 : &offsets64,
str.array);
str.array);
if (!success) {
blog(LOG_INFO, "load_graphics_offsets: Failed to load string");
}
@@ -227,7 +231,7 @@ bool load_cached_graphics_offsets(bool is32bit, const char *config_path)
dstr_copy(&config_ini, config_path);
dstr_cat(&config_ini, is32bit ? "32.ini" : "64.ini");
success = load_offsets_from_file(is32bit ? &offsets32 : &offsets64,
config_ini.array);
config_ini.array);
if (!success)
success = load_graphics_offsets(is32bit, config_path);