Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
steam-runtime-tools
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
steamrt
steam-runtime-tools
Commits
fed9ce4c
Commit
fed9ce4c
authored
7 years ago
by
Vivek Das Mohapatra
Browse files
Options
Downloads
Patches
Plain Diff
Clean up the DEBUG messages some more
parent
830171cb
No related branches found
No related tags found
1 merge request
!311
Build capsule-capture-libs from a bundled copy of libcapsule
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
capsule/capsule-dlmopen.c
+8
-8
8 additions, 8 deletions
capsule/capsule-dlmopen.c
with
8 additions
and
8 deletions
capsule/capsule-dlmopen.c
+
8
−
8
View file @
fed9ce4c
...
@@ -839,6 +839,7 @@ load_ld_cache (ldlibs_t *libs, const char *path)
...
@@ -839,6 +839,7 @@ load_ld_cache (ldlibs_t *libs, const char *path)
// plain modern (circa 2016) cache map:
// plain modern (circa 2016) cache map:
if
(
memcmp
(
libs
->
cache_mmap
->
magic
,
CACHEMAGIC
,
sizeof
(
CACHEMAGIC
)
-
1
)
)
if
(
memcmp
(
libs
->
cache_mmap
->
magic
,
CACHEMAGIC
,
sizeof
(
CACHEMAGIC
)
-
1
)
)
{
{
DEBUG
(
DEBUG_LDCACHE
,
"New format ld cache"
);
libs
->
cache
.
new
=
(
struct
cache_file_new
*
)
libs
->
cache_mmap
;
libs
->
cache
.
new
=
(
struct
cache_file_new
*
)
libs
->
cache_mmap
;
// if the magic strings don't reside at the expected offsets, bail out:
// if the magic strings don't reside at the expected offsets, bail out:
...
@@ -863,6 +864,8 @@ load_ld_cache (ldlibs_t *libs, const char *path)
...
@@ -863,6 +864,8 @@ load_ld_cache (ldlibs_t *libs, const char *path)
size_t
offset
=
ALIGN_CACHE
(
block
);
size_t
offset
=
ALIGN_CACHE
(
block
);
int
nlibs
=
libs
->
cache_mmap
->
nlibs
;
int
nlibs
=
libs
->
cache_mmap
->
nlibs
;
DEBUG
(
DEBUG_LDCACHE
,
"Old format ld cache"
);
// it's an old-style cache, unless we successfully probe for a
// it's an old-style cache, unless we successfully probe for a
// nested new cache inside it:
// nested new cache inside it:
libs
->
ctype
=
CACHE_OLD
;
libs
->
ctype
=
CACHE_OLD
;
...
@@ -887,24 +890,21 @@ load_ld_cache (ldlibs_t *libs, const char *path)
...
@@ -887,24 +890,21 @@ load_ld_cache (ldlibs_t *libs, const char *path)
}
}
else
else
{
{
DEBUG
(
DEBUG_LDCACHE
,
"... with a new style cache inside"
);
libs
->
ctype
=
CACHE_NEW
;
libs
->
ctype
=
CACHE_NEW
;
libs
->
cache_data
=
(
char
*
)
libs
->
cache
.
new
;
libs
->
cache_data
=
(
char
*
)
libs
->
cache
.
new
;
}
}
}
}
}
}
if
(
libs
->
cache_fd
>=
0
)
if
(
libs
->
cache_fd
>=
0
)
{
{
if
(
libs
->
debug
)
DEBUG
(
DEBUG_LDCACHE
,
"Opened ld.cache at %s"
,
cachepath
);
fprintf
(
stderr
,
"Opened ld.cache at %s
\n
"
,
cachepath
);
rv
=
1
;
rv
=
1
;
}
}
else
else
{
{
if
(
libs
->
debug
)
DEBUG
(
DEBUG_LDCACHE
,
"No ld.cache at %s"
,
cachepath
);
fprintf
(
stderr
,
"No ld.cache at %s
\n
"
,
cachepath
);
rv
=
0
;
rv
=
0
;
}
}
...
@@ -1316,7 +1316,7 @@ static int install_wrappers ( void *dl_handle,
...
@@ -1316,7 +1316,7 @@ static int install_wrappers ( void *dl_handle,
if
(
errcode
)
if
(
errcode
)
*
errcode
=
EINVAL
;
*
errcode
=
EINVAL
;
DEBUG
(
DEBUG_WRAPPERS
,
"mangling
dlopen
symbols: %s"
,
*
error
);
DEBUG
(
DEBUG_WRAPPERS
,
"mangling
capsule
symbols: %s"
,
*
error
);
return
-
1
;
return
-
1
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment