Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
criu
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhul
criu
Commits
f1b41e08
Commit
f1b41e08
authored
Aug 11, 2012
by
Pavel Emelyanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code: Replace 0x%x with %#x in messages
Signed-off-by:
Pavel Emelyanov
<
xemul@parallels.com
>
parent
a1b731da
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
mount.c
mount.c
+2
-2
sk-unix.c
sk-unix.c
+3
-3
No files found.
mount.c
View file @
f1b41e08
...
@@ -208,7 +208,7 @@ static DIR *open_mountpoint(struct mount_info *pm)
...
@@ -208,7 +208,7 @@ static DIR *open_mountpoint(struct mount_info *pm)
}
}
if
(
st
.
st_dev
!=
pm
->
s_dev
)
{
if
(
st
.
st_dev
!=
pm
->
s_dev
)
{
pr_err
(
"The file system
0x%
x %s %s is inaccessible
\n
"
,
pr_err
(
"The file system
%#
x %s %s is inaccessible
\n
"
,
pm
->
s_dev
,
pm
->
fstype
->
name
,
pm
->
mountpoint
);
pm
->
s_dev
,
pm
->
fstype
->
name
,
pm
->
mountpoint
);
close
(
fd
);
close
(
fd
);
return
NULL
;
return
NULL
;
...
@@ -471,7 +471,7 @@ static int dump_one_mountpoint(struct mount_info *pm, int fd)
...
@@ -471,7 +471,7 @@ static int dump_one_mountpoint(struct mount_info *pm, int fd)
me
.
options
=
pm
->
options
;
me
.
options
=
pm
->
options
;
if
(
!
me
.
fstype
&&
!
is_root_mount
(
pm
))
{
if
(
!
me
.
fstype
&&
!
is_root_mount
(
pm
))
{
pr_err
(
"FS mnt %s dev
0x%
x root %s unsupported
\n
"
,
pr_err
(
"FS mnt %s dev
%#
x root %s unsupported
\n
"
,
pm
->
mountpoint
,
pm
->
s_dev
,
pm
->
root
);
pm
->
mountpoint
,
pm
->
s_dev
,
pm
->
root
);
return
-
1
;
return
-
1
;
}
}
...
...
sk-unix.c
View file @
f1b41e08
...
@@ -64,7 +64,7 @@ static struct unix_sk_listen_icon *lookup_unix_listen_icons(int peer_ino)
...
@@ -64,7 +64,7 @@ static struct unix_sk_listen_icon *lookup_unix_listen_icons(int peer_ino)
static
void
show_one_unix
(
char
*
act
,
const
struct
unix_sk_desc
*
sk
)
static
void
show_one_unix
(
char
*
act
,
const
struct
unix_sk_desc
*
sk
)
{
{
pr_debug
(
"
\t
%s: ino
0x%x peer_ino 0x%
x family %4d type %4d state %2d name %s
\n
"
,
pr_debug
(
"
\t
%s: ino
%#x peer_ino %#
x family %4d type %4d state %2d name %s
\n
"
,
act
,
sk
->
sd
.
ino
,
sk
->
peer_ino
,
sk
->
sd
.
family
,
sk
->
type
,
sk
->
state
,
sk
->
name
);
act
,
sk
->
sd
.
ino
,
sk
->
peer_ino
,
sk
->
sd
.
family
,
sk
->
type
,
sk
->
state
,
sk
->
name
);
if
(
sk
->
nr_icons
)
{
if
(
sk
->
nr_icons
)
{
...
@@ -77,7 +77,7 @@ static void show_one_unix(char *act, const struct unix_sk_desc *sk)
...
@@ -77,7 +77,7 @@ static void show_one_unix(char *act, const struct unix_sk_desc *sk)
static
void
show_one_unix_img
(
const
char
*
act
,
const
UnixSkEntry
*
e
)
static
void
show_one_unix_img
(
const
char
*
act
,
const
UnixSkEntry
*
e
)
{
{
pr_info
(
"
\t
%s: id
0x%x ino 0x%x peer 0x%
x type %d state %d name %d bytes
\n
"
,
pr_info
(
"
\t
%s: id
%#x ino %#x peer %#
x type %d state %d name %d bytes
\n
"
,
act
,
e
->
id
,
e
->
ino
,
e
->
peer
,
e
->
type
,
e
->
state
,
(
int
)
e
->
name
.
len
);
act
,
e
->
id
,
e
->
ino
,
e
->
peer
,
e
->
type
,
e
->
state
,
(
int
)
e
->
name
.
len
);
}
}
...
@@ -745,7 +745,7 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base)
...
@@ -745,7 +745,7 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base)
ui
->
peer
=
NULL
;
ui
->
peer
=
NULL
;
ui
->
flags
=
0
;
ui
->
flags
=
0
;
pr_info
(
" `- Got
0x%x peer 0x%
x
\n
"
,
ui
->
ue
->
ino
,
ui
->
ue
->
peer
);
pr_info
(
" `- Got
%#x peer %#
x
\n
"
,
ui
->
ue
->
ino
,
ui
->
ue
->
peer
);
file_desc_add
(
&
ui
->
d
,
ui
->
ue
->
id
,
&
unix_desc_ops
);
file_desc_add
(
&
ui
->
d
,
ui
->
ue
->
id
,
&
unix_desc_ops
);
list_add_tail
(
&
ui
->
list
,
&
unix_sockets
);
list_add_tail
(
&
ui
->
list
,
&
unix_sockets
);
...
...
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