rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

fix code style

Browse Source
This commit is contained in:
Voha 2012-12-24 02:31:14 +02:00 committed by a*morale
parent 427bbd0a80
commit e4f98b31c6
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ground/openpilotgcs/src/plugins/rawhid/pjrc_rawhid_mac.cpp
View File

@ -274,21 +274,21 @@ QString pjrc_rawhid::getserial(int num) {
CFTypeRef serialnum = IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDSerialNumberKey));
if(serialnum && CFGetTypeID(serialnum) == CFStringGetTypeID())
{
//Note: I'm not sure it will always succeed if encoded as MacRoman but that
//is a superset of UTF8 so I think this is fine
CFStringRef str = (CFStringRef)serialnum;
//Note: I'm not sure it will always succeed if encoded as MacRoman but that
//is a superset of UTF8 so I think this is fine
CFStringRef str = (CFStringRef)serialnum;
// const char * buf = CFStringGetCStringPtr(str, kCFStringEncodingMacRoman);
//return QString(buf);
int length = CFStringGetLength(str);
if( length == 0 )
return "";
char* ptr = (char*)malloc( length+1 );
Boolean ret = CFStringGetCString( str, ptr, length+1, kCFStringEncodingMacRoman );
QString strResult;
if( ret == true )
strResult = ptr;
free( ptr );
return strResult;
//return QString(buf);
int length = CFStringGetLength(str);
if( length == 0 )
return "";
char* ptr = (char*)malloc( length+1 );
Boolean ret = CFStringGetCString( str, ptr, length+1, kCFStringEncodingMacRoman );
QString strResult;
if( ret == true )
strResult = ptr;
free( ptr );
return strResult;
}
return QString("Error");