Remove unused Minijail flag and make multi-line comments consistent.
Bug: 25870500
Change-Id: Ic9306659ab2ae91c45a3062f08964ec8c0c15320
diff --git a/libminijail.c b/libminijail.c
index e3b7a65..ac701e6 100644
--- a/libminijail.c
+++ b/libminijail.c
@@ -98,7 +98,6 @@
int seccomp:1;
int remount_proc_ro:1;
int usergroups:1;
- int ptrace:1;
int no_new_privs:1;
int seccomp_filter:1;
int log_seccomp_filter:1;
@@ -364,11 +363,6 @@
j->flags.usergroups = 1;
}
-void API minijail_disable_ptrace(struct minijail *j)
-{
- j->flags.ptrace = 1;
-}
-
void API minijail_run_as_init(struct minijail *j)
{
/*
@@ -631,7 +625,8 @@
return (state.total > available);
}
-/* consumebytes: consumes @length bytes from a buffer @buf of length @buflength
+/*
+ * consumebytes: consumes @length bytes from a buffer @buf of length @buflength
* @length Number of bytes to consume
* @buf Buffer to consume from
* @buflength Size of @buf
@@ -648,7 +643,8 @@
return p;
}
-/* consumestr: consumes a C string from a buffer @buf of length @length
+/*
+ * consumestr: consumes a C string from a buffer @buf of length @length
* @buf Buffer to consume
* @length Length of buffer
*
@@ -823,7 +819,8 @@
pdie("setresgid");
}
-/* mount_one: Applies mounts from @m for @j, recursing as needed.
+/*
+ * mount_one: Applies mounts from @m for @j, recursing as needed.
* @j Minijail these mounts are for
* @m Head of list of mounts
*
@@ -969,8 +966,10 @@
if (initgroups(j->user, j->usergid))
pdie("initgroups");
} else {
- /* Only attempt to clear supplemental groups if we are changing
- * users. */
+ /*
+ * Only attempt to clear supplemental groups if we are changing
+ * users.
+ */
if ((j->uid || j->gid) && setgroups(0, NULL))
pdie("setgroups");
}
@@ -1493,7 +1492,8 @@
return -EFAULT;
}
- /* Use sys_clone() if and only if we're creating a pid namespace.
+ /*
+ * Use sys_clone() if and only if we're creating a pid namespace.
*
* tl;dr: WARNING: do not mix pid namespaces and multithreading.
*