Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
754aeae1
Commit
754aeae1
authored
Jan 27, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove always false b_junk cache entry property
parent
38430d10
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
13 deletions
+1
-13
src/modules/cache.c
src/modules/cache.c
+1
-7
src/modules/modules.c
src/modules/modules.c
+0
-5
src/modules/modules.h
src/modules/modules.h
+0
-1
No files found.
src/modules/cache.c
View file @
754aeae1
...
@@ -58,7 +58,7 @@ static int CacheLoadConfig ( module_t *, FILE * );
...
@@ -58,7 +58,7 @@ static int CacheLoadConfig ( module_t *, FILE * );
/* Sub-version number
/* Sub-version number
* (only used to avoid breakage in dev version when cache structure changes) */
* (only used to avoid breakage in dev version when cache structure changes) */
#define CACHE_SUBVERSION_NUM
8
#define CACHE_SUBVERSION_NUM
9
/* Format string for the cache filename */
/* Format string for the cache filename */
#define CACHENAME_FORMAT \
#define CACHENAME_FORMAT \
...
@@ -233,11 +233,8 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
...
@@ -233,11 +233,8 @@ void CacheLoad( vlc_object_t *p_this, module_bank_t *p_bank, bool b_delete )
LOAD_STRING
(
pp_cache
[
i
]
->
psz_file
);
LOAD_STRING
(
pp_cache
[
i
]
->
psz_file
);
LOAD_IMMEDIATE
(
pp_cache
[
i
]
->
i_time
);
LOAD_IMMEDIATE
(
pp_cache
[
i
]
->
i_time
);
LOAD_IMMEDIATE
(
pp_cache
[
i
]
->
i_size
);
LOAD_IMMEDIATE
(
pp_cache
[
i
]
->
i_size
);
LOAD_IMMEDIATE
(
pp_cache
[
i
]
->
b_junk
);
pp_cache
[
i
]
->
b_used
=
false
;
pp_cache
[
i
]
->
b_used
=
false
;
if
(
pp_cache
[
i
]
->
b_junk
)
continue
;
pp_cache
[
i
]
->
p_module
=
vlc_module_create
(
p_this
);
pp_cache
[
i
]
->
p_module
=
vlc_module_create
(
p_this
);
/* Load additional infos */
/* Load additional infos */
...
@@ -533,9 +530,6 @@ static int CacheSaveBank (FILE *file, module_bank_t *p_bank)
...
@@ -533,9 +530,6 @@ static int CacheSaveBank (FILE *file, module_bank_t *p_bank)
SAVE_STRING
(
pp_cache
[
i
]
->
psz_file
);
SAVE_STRING
(
pp_cache
[
i
]
->
psz_file
);
SAVE_IMMEDIATE
(
pp_cache
[
i
]
->
i_time
);
SAVE_IMMEDIATE
(
pp_cache
[
i
]
->
i_time
);
SAVE_IMMEDIATE
(
pp_cache
[
i
]
->
i_size
);
SAVE_IMMEDIATE
(
pp_cache
[
i
]
->
i_size
);
SAVE_IMMEDIATE
(
pp_cache
[
i
]
->
b_junk
);
if
(
pp_cache
[
i
]
->
b_junk
)
continue
;
/* Save additional infos */
/* Save additional infos */
SAVE_STRING
(
pp_cache
[
i
]
->
p_module
->
psz_object_name
);
SAVE_STRING
(
pp_cache
[
i
]
->
p_module
->
psz_object_name
);
...
...
src/modules/modules.c
View file @
754aeae1
...
@@ -933,10 +933,6 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank,
...
@@ -933,10 +933,6 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank,
p_module
=
AllocatePlugin
(
p_this
,
psz_file
);
p_module
=
AllocatePlugin
(
p_this
,
psz_file
);
}
}
else
else
/* If junk dll, don't try to load it */
if
(
p_cache_entry
->
b_junk
)
return
-
1
;
else
{
{
module_config_t
*
p_item
=
NULL
,
*
p_end
=
NULL
;
module_config_t
*
p_item
=
NULL
,
*
p_end
=
NULL
;
...
@@ -986,7 +982,6 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank,
...
@@ -986,7 +982,6 @@ static int AllocatePluginFile( vlc_object_t * p_this, module_bank_t *p_bank,
pp_cache
[
p_bank
->
i_cache
]
->
psz_file
=
strdup
(
psz_file
);
pp_cache
[
p_bank
->
i_cache
]
->
psz_file
=
strdup
(
psz_file
);
pp_cache
[
p_bank
->
i_cache
]
->
i_time
=
i_file_time
;
pp_cache
[
p_bank
->
i_cache
]
->
i_time
=
i_file_time
;
pp_cache
[
p_bank
->
i_cache
]
->
i_size
=
i_file_size
;
pp_cache
[
p_bank
->
i_cache
]
->
i_size
=
i_file_size
;
pp_cache
[
p_bank
->
i_cache
]
->
b_junk
=
p_module
?
0
:
1
;
pp_cache
[
p_bank
->
i_cache
]
->
b_used
=
true
;
pp_cache
[
p_bank
->
i_cache
]
->
b_used
=
true
;
pp_cache
[
p_bank
->
i_cache
]
->
p_module
=
p_module
;
pp_cache
[
p_bank
->
i_cache
]
->
p_module
=
p_module
;
p_bank
->
pp_cache
=
pp_cache
;
p_bank
->
pp_cache
=
pp_cache
;
...
...
src/modules/modules.h
View file @
754aeae1
...
@@ -63,7 +63,6 @@ struct module_cache_t
...
@@ -63,7 +63,6 @@ struct module_cache_t
char
*
psz_file
;
char
*
psz_file
;
int64_t
i_time
;
int64_t
i_time
;
int64_t
i_size
;
int64_t
i_size
;
bool
b_junk
;
/* Optional extra data */
/* Optional extra data */
bool
b_used
;
bool
b_used
;
...
...
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