XQuartz: clang static analysis fixes
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 4127e8e5be
)
This commit is contained in:
parent
f0ec2e0d7d
commit
4d8ad88b57
|
@ -548,7 +548,7 @@ static CGLPixelFormatObj makeFormat(__GLXconfig *conf) {
|
|||
attr[i++] = conf->samples;
|
||||
}
|
||||
|
||||
attr[i++] = 0;
|
||||
attr[i + 1] = 0;
|
||||
|
||||
error = CGLChoosePixelFormat(attr, &fobj, &formats);
|
||||
if(error) {
|
||||
|
|
|
@ -62,7 +62,7 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
|
|||
int numConfigs = 0;
|
||||
__GLXconfig *visualConfigs, *c;
|
||||
struct glCapabilities caps;
|
||||
struct glCapabilitiesConfig *conf = NULL;
|
||||
struct glCapabilitiesConfig *conf;
|
||||
int stereo, depth, aux, buffers, stencil, accum, color, msample;
|
||||
|
||||
if(getGlCapabilities(&caps)) {
|
||||
|
@ -94,7 +94,6 @@ __GLXconfig *__glXAquaCreateVisualConfigs(int *numConfigsPtr, int screenNumber)
|
|||
*/
|
||||
|
||||
assert(NULL != caps.configurations);
|
||||
conf = caps.configurations;
|
||||
|
||||
numConfigs = 0;
|
||||
|
||||
|
|
|
@ -482,7 +482,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
|
|||
return out;
|
||||
}
|
||||
|
||||
- (CFPropertyListRef) prefs_get:(NSString *)key {
|
||||
- (CFPropertyListRef) prefs_get_copy:(NSString *)key {
|
||||
CFPropertyListRef value;
|
||||
|
||||
value = CFPreferencesCopyAppValue ((CFStringRef) key, app_prefs_domain_cfstr);
|
||||
|
@ -543,7 +543,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
|
|||
CFPropertyListRef value;
|
||||
int ret;
|
||||
|
||||
value = [self prefs_get:key];
|
||||
value = [self prefs_get_copy:key];
|
||||
|
||||
if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())
|
||||
CFNumberGetValue (value, kCFNumberIntType, &ret);
|
||||
|
@ -561,7 +561,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
|
|||
CFPropertyListRef value;
|
||||
const char *ret = NULL;
|
||||
|
||||
value = [self prefs_get:key];
|
||||
value = [self prefs_get_copy:key];
|
||||
|
||||
if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
|
||||
NSString *s = (NSString *) value;
|
||||
|
@ -578,12 +578,13 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
|
|||
CFPropertyListRef value;
|
||||
NSURL *ret = NULL;
|
||||
|
||||
value = [self prefs_get:key];
|
||||
value = [self prefs_get_copy:key];
|
||||
|
||||
if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ()) {
|
||||
NSString *s = (NSString *) value;
|
||||
|
||||
ret = [NSURL URLWithString:s];
|
||||
[ret retain];
|
||||
}
|
||||
|
||||
if (value != NULL) CFRelease (value);
|
||||
|
@ -595,7 +596,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
|
|||
CFPropertyListRef value;
|
||||
float ret = def;
|
||||
|
||||
value = [self prefs_get:key];
|
||||
value = [self prefs_get_copy:key];
|
||||
|
||||
if (value != NULL
|
||||
&& CFGetTypeID (value) == CFNumberGetTypeID ()
|
||||
|
@ -613,7 +614,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
|
|||
CFPropertyListRef value;
|
||||
int ret = def;
|
||||
|
||||
value = [self prefs_get:key];
|
||||
value = [self prefs_get_copy:key];
|
||||
|
||||
if (value != NULL) {
|
||||
if (CFGetTypeID (value) == CFNumberGetTypeID ())
|
||||
|
@ -637,7 +638,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
|
|||
NSArray *ret = nil;
|
||||
CFPropertyListRef value;
|
||||
|
||||
value = [self prefs_get:key];
|
||||
value = [self prefs_get_copy:key];
|
||||
|
||||
if (value != NULL) {
|
||||
if (CFGetTypeID (value) == CFArrayGetTypeID ())
|
||||
|
@ -757,7 +758,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
|
|||
NSURL *url = [self prefs_copy_url:@PREFS_UPDATE_FEED default:nil];
|
||||
if(url) {
|
||||
[[SUUpdater sharedUpdater] setFeedURL:url];
|
||||
CFRelease(url);
|
||||
[url release];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
@ -970,6 +971,7 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
|
|||
// [[SUUpdater sharedUpdater] checkForUpdates:X11App];
|
||||
#endif
|
||||
|
||||
[pool release];
|
||||
[NSApp run];
|
||||
/* not reached */
|
||||
}
|
||||
|
|
|
@ -641,30 +641,46 @@ static int execute(const char *command) {
|
|||
static char *command_from_prefs(const char *key, const char *default_value) {
|
||||
char *command = NULL;
|
||||
|
||||
CFStringRef cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
|
||||
CFPropertyListRef PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
|
||||
CFStringRef cfKey;
|
||||
CFPropertyListRef PlistRef;
|
||||
|
||||
if(!key)
|
||||
return NULL;
|
||||
|
||||
cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
|
||||
|
||||
if(!cfKey)
|
||||
return NULL;
|
||||
|
||||
PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
|
||||
|
||||
if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
|
||||
CFStringRef cfDefaultValue = CFStringCreateWithCString(NULL, default_value, kCFStringEncodingASCII);
|
||||
int len = strlen(default_value) + 1;
|
||||
|
||||
if(!cfDefaultValue)
|
||||
goto command_from_prefs_out;
|
||||
|
||||
CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);
|
||||
CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
|
||||
CFRelease(cfDefaultValue);
|
||||
|
||||
command = (char *)malloc(len * sizeof(char));
|
||||
if(!command)
|
||||
return NULL;
|
||||
goto command_from_prefs_out;
|
||||
strcpy(command, default_value);
|
||||
} else {
|
||||
int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
|
||||
command = (char *)malloc(len * sizeof(char));
|
||||
if(!command)
|
||||
return NULL;
|
||||
goto command_from_prefs_out;
|
||||
CFStringGetCString((CFStringRef)PlistRef, command, len, kCFStringEncodingASCII);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
command_from_prefs_out:
|
||||
if (PlistRef)
|
||||
CFRelease(PlistRef);
|
||||
|
||||
if(cfKey)
|
||||
CFRelease(cfKey);
|
||||
return command;
|
||||
}
|
||||
|
|
|
@ -73,7 +73,6 @@ static void set_x11_path(void) {
|
|||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
|
||||
|
||||
CFURLRef appURL = NULL;
|
||||
CFBundleRef bundle = NULL;
|
||||
OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
|
||||
|
||||
switch (osstatus) {
|
||||
|
@ -84,12 +83,6 @@ static void set_x11_path(void) {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
bundle = CFBundleCreate(NULL, appURL);
|
||||
if(!bundle) {
|
||||
fprintf(stderr, "Xquartz: Null value returned from CFBundleCreate().\n");
|
||||
exit(2);
|
||||
}
|
||||
|
||||
if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
|
||||
fprintf(stderr, "Xquartz: Error resolving URL for %s\n", kX11AppBundleId);
|
||||
exit(3);
|
||||
|
|
|
@ -58,15 +58,6 @@ struct atom_list {
|
|||
/* The unmapped window we use for fetching selections. */
|
||||
Window _selection_window;
|
||||
|
||||
/* Last time we declared anything on the pasteboard. */
|
||||
int _my_last_change;
|
||||
|
||||
/* Name of the selection we're proxying onto the pasteboard. */
|
||||
Atom _proxied_selection;
|
||||
|
||||
/* When true, we're expecting a SelectionNotify event. */
|
||||
unsigned int _pending_notify :1;
|
||||
|
||||
Atom request_atom;
|
||||
|
||||
struct {
|
||||
|
|
|
@ -204,6 +204,7 @@ QuartzAudioIOProc(
|
|||
if (wasPlaying && !data->playing) {
|
||||
OSStatus err;
|
||||
err = AudioDeviceStop(inDevice, QuartzAudioIOProc);
|
||||
fprintf(stderr, "Error stopping audio device: %ld\n", (long int)err);
|
||||
}
|
||||
pthread_mutex_unlock(&data->lock);
|
||||
return 0;
|
||||
|
|
|
@ -368,7 +368,7 @@ void DarwinKeyboardReloadHandler(void) {
|
|||
KeySymsRec keySyms;
|
||||
CFIndex initialKeyRepeatValue, keyRepeatValue;
|
||||
BOOL ok;
|
||||
DeviceIntPtr pDev = darwinKeyboard;
|
||||
DeviceIntPtr pDev;
|
||||
const char *xmodmap = PROJECTROOT "/bin/xmodmap";
|
||||
const char *sysmodmap = PROJECTROOT "/lib/X11/xinit/.Xmodmap";
|
||||
const char *homedir = getenv("HOME");
|
||||
|
|
Loading…
Reference in New Issue