Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
f824e55b
Commit
f824e55b
authored
Jan 24, 2009
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skins2: use calloc and NULL at the righ place.
parent
e710aeb8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
17 deletions
+15
-17
modules/gui/skins2/src/dialogs.cpp
modules/gui/skins2/src/dialogs.cpp
+15
-17
No files found.
modules/gui/skins2/src/dialogs.cpp
View file @
f824e55b
...
...
@@ -195,9 +195,8 @@ void Dialogs::showFileGeneric( const string &rTitle, const string &rExtensions,
{
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
intf_dialog_args_t
*
p_arg
=
(
intf_dialog_args_t
*
)
malloc
(
sizeof
(
intf_dialog_args_t
)
);
memset
(
p_arg
,
0
,
sizeof
(
intf_dialog_args_t
)
);
intf_dialog_args_t
*
p_arg
=
(
intf_dialog_args_t
*
)
calloc
(
1
,
sizeof
(
intf_dialog_args_t
)
);
p_arg
->
psz_title
=
strdup
(
rTitle
.
c_str
()
);
p_arg
->
psz_extensions
=
strdup
(
rExtensions
.
c_str
()
);
...
...
@@ -243,7 +242,7 @@ void Dialogs::showPlaylist()
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_PLAYLIST
,
0
,
0
);
0
,
NULL
);
}
}
...
...
@@ -252,7 +251,7 @@ void Dialogs::showFileSimple( bool play )
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_FILE_SIMPLE
,
(
int
)
play
,
0
);
(
int
)
play
,
NULL
);
}
}
...
...
@@ -262,7 +261,7 @@ void Dialogs::showFile( bool play )
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_FILE
,
(
int
)
play
,
0
);
(
int
)
play
,
NULL
);
}
}
...
...
@@ -272,7 +271,7 @@ void Dialogs::showDirectory( bool play )
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_DIRECTORY
,
(
int
)
play
,
0
);
(
int
)
play
,
NULL
);
}
}
...
...
@@ -282,7 +281,7 @@ void Dialogs::showDisc( bool play )
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_DISC
,
(
int
)
play
,
0
);
(
int
)
play
,
NULL
);
}
}
...
...
@@ -292,7 +291,7 @@ void Dialogs::showNet( bool play )
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_NET
,
(
int
)
play
,
0
);
(
int
)
play
,
NULL
);
}
}
...
...
@@ -301,7 +300,7 @@ void Dialogs::showMessages()
{
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_MESSAGES
,
0
,
0
);
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_MESSAGES
,
0
,
NULL
);
}
}
...
...
@@ -310,7 +309,7 @@ void Dialogs::showPrefs()
{
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_PREFS
,
0
,
0
);
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_PREFS
,
0
,
NULL
);
}
}
...
...
@@ -319,7 +318,7 @@ void Dialogs::showFileInfo()
{
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_FILEINFO
,
0
,
0
);
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_FILEINFO
,
0
,
NULL
);
}
}
...
...
@@ -328,7 +327,7 @@ void Dialogs::showStreamingWizard()
{
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_WIZARD
,
0
,
0
);
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
INTF_DIALOG_WIZARD
,
0
,
NULL
);
}
}
...
...
@@ -338,15 +337,14 @@ void Dialogs::showPopupMenu( bool bShow, int popupType = INTF_DIALOG_POPUPMENU )
if
(
m_pProvider
&&
m_pProvider
->
pf_show_dialog
)
{
m_pProvider
->
pf_show_dialog
(
m_pProvider
,
popupType
,
(
int
)
bShow
,
0
);
(
int
)
bShow
,
NULL
);
}
}
void
Dialogs
::
showInteraction
(
interaction_dialog_t
*
p_dialog
)
{
intf_dialog_args_t
*
p_arg
=
(
intf_dialog_args_t
*
)
malloc
(
sizeof
(
intf_dialog_args_t
)
);
memset
(
p_arg
,
0
,
sizeof
(
intf_dialog_args_t
)
);
intf_dialog_args_t
*
p_arg
=
(
intf_dialog_args_t
*
)
calloc
(
1
,
sizeof
(
intf_dialog_args_t
)
);
p_arg
->
p_dialog
=
p_dialog
;
p_arg
->
p_intf
=
getIntf
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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