Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

little changes #8410

Merged
merged 3 commits into from
Jan 16, 2016
Merged

little changes #8410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53ac6d9
Little things
latot Jan 9, 2016
06d9f06
enable sudo in travis
latot Jan 10, 2016
e82620c
remove
latot Jan 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# https://travis-ci.org

sudo: required
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

travis do some changes the some year, the new proyect added after 2014, need include this line to works if it requieres root, in the proyect don't affects this but forks yes, and is very problematic when at least i try to make a pull request, any pr fails but if i do a change to can works with travis but that commit will be reflacted in the pr, finally i think its better inlcude it and simplify this.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe that was part of the whitelisting we got earlier, because it was before/around when they added the containers.

I suppose this isn't an issue, though.

-[Unknown]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mm, well its right don't is a issdue of the main proyects, but as we saw with all my failed commits (resync fork) in the irc affects the forks, anyway i only can opine about this, then remove or not?


language: cpp

os: linux
Expand Down
3 changes: 1 addition & 2 deletions Core/FileSystems/ISOFileSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,8 +814,7 @@ void ISOFileSystem::DoState(PointerWrap &p)
bool hasFile = of.file != NULL;
p.Do(hasFile);
if (hasFile) {
std::string path = "";
path = EntryFullPath(of.file);
std::string path = EntryFullPath(of.file);
p.Do(path);
}
}
Expand Down
4 changes: 1 addition & 3 deletions Core/HLE/sceAtrac.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,14 +1192,12 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3
}

static u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishFlagAddr, u32 remainAddr) {
int ret = -1;

// Note that outAddr being null is completely valid here, used to skip data.

u32 numSamples = 0;
u32 finish = 0;
int remains = 0;
ret = _AtracDecodeData(atracID, Memory::GetPointer(outAddr), outAddr, &numSamples, &finish, &remains);
int ret = _AtracDecodeData(atracID, Memory::GetPointer(outAddr), outAddr, &numSamples, &finish, &remains);
if (ret != (int)ATRAC_ERROR_BAD_ATRACID && ret != (int)ATRAC_ERROR_NO_DATA) {
if (Memory::IsValidAddress(numSamplesAddr))
Memory::Write_U32(numSamples, numSamplesAddr);
Expand Down
6 changes: 2 additions & 4 deletions Core/HLE/sceNetAdhoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,7 @@ static int sceNetAdhocPdpCreate(const char *mac, u32 port, int bufferSize, u32 u
//return ERROR_NET_ADHOC_PORT_IN_USE;

// Create Internet UDP Socket
int usocket = (int)INVALID_SOCKET;
usocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
int usocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
// Valid Socket produced
if (usocket != INVALID_SOCKET) {
// Change socket buffer size when necessary
Expand Down Expand Up @@ -1644,8 +1643,7 @@ static int sceNetAdhocPtpOpen(const char *srcmac, int sport, const char *dstmac,
// Valid Arguments
if (bufsize > 0 && rexmt_int > 0 && rexmt_cnt > 0) {
// Create Infrastructure Socket
int tcpsocket = (int)INVALID_SOCKET;
tcpsocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
int tcpsocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);

// Valid Socket produced
if (tcpsocket > 0) {
Expand Down
6 changes: 4 additions & 2 deletions UI/MiscScreens.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,12 @@ void DrawBackground(UIContext &dc, float alpha = 1.0f) {
last_yres = yres;
}

int img = I_BG;
#ifdef GOLD
img = I_BG_GOLD;
int img = I_BG_GOLD;
#else
int img = I_BG;
#endif

ui_draw2d.DrawImageStretch(img, dc.GetBounds());
float t = time_now();
for (int i = 0; i < 100; i++) {
Expand Down
4 changes: 1 addition & 3 deletions ext/native/ext/glew/glew.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ void* NSGLGetProcAddress (const GLubyte *name)
void* NSGLGetProcAddress (const GLubyte *name)
{
static const struct mach_header* image = NULL;
NSSymbol symbol;
char* symbolName;
if (NULL == image)
{
Expand All @@ -151,10 +150,9 @@ void* NSGLGetProcAddress (const GLubyte *name)
symbolName = malloc(strlen((const char*)name) + 2);
strcpy(symbolName+1, (const char*)name);
symbolName[0] = '_';
symbol = NULL;
/* if (NSIsSymbolNameDefined(symbolName))
symbol = NSLookupAndBindSymbol(symbolName); */
symbol = image ? NSLookupSymbolInImage(image, symbolName, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR) : NULL;
NSSSymbol symbol = image ? NSLookupSymbolInImage(image, symbolName, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR) : NULL;
free(symbolName);
if( symbol ) return NSAddressOfSymbol(symbol);
#ifdef GLEW_APPLE_GLX
Expand Down
2 changes: 1 addition & 1 deletion ext/native/tools/atlastool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ inline vector<CharRange> merge(const vector<CharRange> &a, const vector<CharRang
return result;
}

void RasterizeFonts(const FontReferenceList fontRefs, vector<CharRange> &ranges, float *metrics_height, Bucket *bucket) {
void RasterizeFonts(const FontReferenceList &fontRefs, vector<CharRange> &ranges, float *metrics_height, Bucket *bucket) {
FT_Library freetype;
CHECK(FT_Init_FreeType(&freetype) == 0);

Expand Down