Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
006625e3
Commit
006625e3
authored
Feb 20, 2008
by
damienf
Browse files
macosx: fix compile/runtime warnings
parent
6cf432c2
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/gui/macosx/intf.m
View file @
006625e3
...
...
@@ -1989,15 +1989,15 @@ static VLCMain *_o_sharedMainInstance = nil;
[
o_prefs
showPrefs
];
}
#ifdef UPDATE_CHECK
-
(
IBAction
)
checkForUpdate
:(
id
)
sender
{
#ifdef UPDATE_CHECK
if
(
!
nib_update_loaded
)
nib_update_loaded
=
[
NSBundle
loadNibNamed
:
@"Update"
owner
:
self
];
[
o_update
showUpdateWindow
];
}
#endif
}
-
(
IBAction
)
viewHelp
:(
id
)
sender
{
...
...
modules/gui/macosx/playlist.m
View file @
006625e3
...
...
@@ -924,9 +924,9 @@
NSMutableString
*
o_temp
,
*
o_temp2
;
o_temp
=
[
NSMutableString
stringWithString
:
o_uri
];
o_temp2
=
[
NSMutableString
stringWithUTF8String
:
mounts
[
i_index
].
f_mntfromname
];
[
o_temp
replaceOccurrencesOfString
:
@"/dev/rdisk"
withString
:
@"/dev/disk"
options
:
nil
range
:
NSMakeRange
(
0
,
[
o_temp
length
])
];
[
o_temp2
replaceOccurrencesOfString
:
@"s0"
withString
:
@""
options
:
nil
range
:
NSMakeRange
(
0
,
[
o_temp2
length
])
];
[
o_temp2
replaceOccurrencesOfString
:
@"s1"
withString
:
@""
options
:
nil
range
:
NSMakeRange
(
0
,
[
o_temp2
length
])
];
[
o_temp
replaceOccurrencesOfString
:
@"/dev/rdisk"
withString
:
@"/dev/disk"
options
:
NSLiteralSearch
range
:
NSMakeRange
(
0
,
[
o_temp
length
])
];
[
o_temp2
replaceOccurrencesOfString
:
@"s0"
withString
:
@""
options
:
NSLiteralSearch
range
:
NSMakeRange
(
0
,
[
o_temp2
length
])
];
[
o_temp2
replaceOccurrencesOfString
:
@"s1"
withString
:
@""
options
:
NSLiteralSearch
range
:
NSMakeRange
(
0
,
[
o_temp2
length
])
];
if
(
strstr
(
[
o_temp
fileSystemRepresentation
],
[
o_temp2
fileSystemRepresentation
]
)
!=
NULL
)
{
...
...
@@ -951,9 +951,9 @@
statfs
(
[
o_uri
fileSystemRepresentation
],
buf
);
psz_dev
=
strdup
(
buf
->
f_mntfromname
);
o_temp
=
[
NSMutableString
stringWithUTF8String
:
psz_dev
];
[
o_temp
replaceOccurrencesOfString
:
@"/dev/disk"
withString
:
@"/dev/rdisk"
options
:
nil
range
:
NSMakeRange
(
0
,
[
o_temp
length
])
];
[
o_temp
replaceOccurrencesOfString
:
@"s0"
withString
:
@""
options
:
nil
range
:
NSMakeRange
(
0
,
[
o_temp
length
])
];
[
o_temp
replaceOccurrencesOfString
:
@"s1"
withString
:
@""
options
:
nil
range
:
NSMakeRange
(
0
,
[
o_temp
length
])
];
[
o_temp
replaceOccurrencesOfString
:
@"/dev/disk"
withString
:
@"/dev/rdisk"
options
:
NSLiteralSearch
range
:
NSMakeRange
(
0
,
[
o_temp
length
])
];
[
o_temp
replaceOccurrencesOfString
:
@"s0"
withString
:
@""
options
:
NSLiteralSearch
range
:
NSMakeRange
(
0
,
[
o_temp
length
])
];
[
o_temp
replaceOccurrencesOfString
:
@"s1"
withString
:
@""
options
:
NSLiteralSearch
range
:
NSMakeRange
(
0
,
[
o_temp
length
])
];
o_uri
=
o_temp
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment