yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2025-08-04 00:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

NXSwapBigIntToHost is deprecated, use CFSwapInt32BigToHost instead.

Browse source 
Patch by Nico Weber <thakis@chromium.org>


git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@913 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
mark@chromium.org 2012-02-06 17:33:12 +00:00
parent 5e4f6feaf6
commit 3aa10d2a87
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/client/mac/handler/breakpad_nlist_64.cc
View file

@ -67,6 +67,7 @@
#include "breakpad_nlist_64.h" #include "breakpad_nlist_64.h"
#include <CoreFoundation/CoreFoundation.h>
#include <fcntl.h> #include <fcntl.h>
#include <mach-o/nlist.h> #include <mach-o/nlist.h>
#include <mach-o/loader.h> #include <mach-o/loader.h>
@ -190,7 +191,7 @@ int __breakpad_fdnlist(int fd, nlist_type *list, const char **symbolNames,
struct exec buf; struct exec buf;
if (read(fd, (char *)&buf, sizeof(buf)) != sizeof(buf) || if (read(fd, (char *)&buf, sizeof(buf)) != sizeof(buf) ||
(N_BADMAG(buf) && *((uint32_t *)&buf) != magic && (N_BADMAG(buf) && *((uint32_t *)&buf) != magic &&
NXSwapBigLongToHost(*((long *)&buf)) != FAT_MAGIC && CFSwapInt32BigToHost(*((uint32_t *)&buf)) != FAT_MAGIC &&
/* The following is the big-endian ppc64 check */ /* The following is the big-endian ppc64 check */
(*((uint32_t*)&buf)) != FAT_MAGIC)) { (*((uint32_t*)&buf)) != FAT_MAGIC)) {
return -1; return -1;
@ -198,7 +199,7 @@ int __breakpad_fdnlist(int fd, nlist_type *list, const char **symbolNames,
/* Deal with fat file if necessary */ /* Deal with fat file if necessary */
unsigned arch_offset = 0; unsigned arch_offset = 0;
if (NXSwapBigLongToHost(*((long *)&buf)) == FAT_MAGIC || if (CFSwapInt32BigToHost(*((uint32_t *)&buf)) == FAT_MAGIC ||
/* The following is the big-endian ppc64 check */ /* The following is the big-endian ppc64 check */
*((unsigned int *)&buf) == FAT_MAGIC) { *((unsigned int *)&buf) == FAT_MAGIC) {
/* Get host info */ /* Get host info */
@ -222,7 +223,7 @@ int __breakpad_fdnlist(int fd, nlist_type *list, const char **symbolNames,
} }
/* Convert fat_narchs to host byte order */ /* Convert fat_narchs to host byte order */
fh.nfat_arch = NXSwapBigIntToHost(fh.nfat_arch); fh.nfat_arch = CFSwapInt32BigToHost(fh.nfat_arch);
/* Read in the fat archs */ /* Read in the fat archs */
struct fat_arch *fat_archs = struct fat_arch *fat_archs =
@ -243,15 +244,15 @@ int __breakpad_fdnlist(int fd, nlist_type *list, const char **symbolNames,
*/ */
for (unsigned i = 0; i < fh.nfat_arch; i++) { for (unsigned i = 0; i < fh.nfat_arch; i++) {
fat_archs[i].cputype = fat_archs[i].cputype =
NXSwapBigIntToHost(fat_archs[i].cputype); CFSwapInt32BigToHost(fat_archs[i].cputype);
fat_archs[i].cpusubtype = fat_archs[i].cpusubtype =
NXSwapBigIntToHost(fat_archs[i].cpusubtype); CFSwapInt32BigToHost(fat_archs[i].cpusubtype);
fat_archs[i].offset = fat_archs[i].offset =
NXSwapBigIntToHost(fat_archs[i].offset); CFSwapInt32BigToHost(fat_archs[i].offset);
fat_archs[i].size = fat_archs[i].size =
NXSwapBigIntToHost(fat_archs[i].size); CFSwapInt32BigToHost(fat_archs[i].size);
fat_archs[i].align = fat_archs[i].align =
NXSwapBigIntToHost(fat_archs[i].align); CFSwapInt32BigToHost(fat_archs[i].align);
} }
struct fat_arch *fap = NULL; struct fat_arch *fap = NULL;