packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tree-wide: Switch tabs ⭾ in various files over to spaces ␠ 

As $DEITY intended.

I was reading the `prepare-root.c` code and the indentation damage was
distracting. Squash tabs that have leaked into various places in the code. I
didn't yet touch the `src/libostree` bits as that has higher potential for
conflict.

Closes: #852
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-05-11 10:59:21 -04:00 committed by Atomic Bot
parent ce4d21bc17
commit b83d509e78
6 changed files with 93 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ostree/ostree-trivial-httpd.c
View File

@ -457,10 +457,10 @@ httpd_callback (SoupServer *server, SoupMessage *msg,
static void static void
on_dir_changed (GFileMonitor *mon, on_dir_changed (GFileMonitor *mon,
GFile *file, GFile *file,
GFile *other, GFile *other,
GFileMonitorEvent event, GFileMonitorEvent event,
gpointer user_data) gpointer user_data)
{ {
OtTrivialHttpd *self = user_data; OtTrivialHttpd *self = user_data;

77
src/rofiles-fuse/main.c
View File

@ -56,12 +56,12 @@ callback_getattr (const char *path, struct stat *st_data)
if (!*path) if (!*path)
{ {
if (fstat (basefd, st_data) == -1) if (fstat (basefd, st_data) == -1)
return -errno; return -errno;
} }
else else
{ {
if (fstatat (basefd, path, st_data, AT_SYMLINK_NOFOLLOW) == -1) if (fstatat (basefd, path, st_data, AT_SYMLINK_NOFOLLOW) == -1)
return -errno; return -errno;
} }
return 0; return 0;
} }
@ -85,7 +85,7 @@ callback_readlink (const char *path, char *buf, size_t size)
static int static int
callback_readdir (const char *path, void *buf, fuse_fill_dir_t filler, callback_readdir (const char *path, void *buf, fuse_fill_dir_t filler,
off_t offset, struct fuse_file_info *fi) off_t offset, struct fuse_file_info *fi)
{ {
DIR *dp; DIR *dp;
struct dirent *de; struct dirent *de;
@ -102,7 +102,7 @@ callback_readdir (const char *path, void *buf, fuse_fill_dir_t filler,
{ {
dfd = openat (basefd, path, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOCTTY); dfd = openat (basefd, path, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOCTTY);
if (dfd == -1) if (dfd == -1)
return -errno; return -errno;
} }
/* Transfers ownership of fd */ /* Transfers ownership of fd */
@ -117,7 +117,7 @@ callback_readdir (const char *path, void *buf, fuse_fill_dir_t filler,
st.st_ino = de->d_ino; st.st_ino = de->d_ino;
st.st_mode = de->d_type << 12; st.st_mode = de->d_type << 12;
if (filler (buf, de->d_name, &st, 0)) if (filler (buf, de->d_name, &st, 0))
break; break;
} }
(void) closedir (dp); (void) closedir (dp);
@ -170,7 +170,7 @@ callback_symlink (const char *from, const char *to)
if (fstatat (basefd, to, &stbuf, AT_SYMLINK_NOFOLLOW) == -1) if (fstatat (basefd, to, &stbuf, AT_SYMLINK_NOFOLLOW) == -1)
{ {
fprintf (stderr, "Failed to find newly created symlink '%s': %s\n", fprintf (stderr, "Failed to find newly created symlink '%s': %s\n",
to, g_strerror (errno)); to, g_strerror (errno));
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
return 0; return 0;
@ -209,19 +209,19 @@ can_write (const char *path)
if (fstatat (basefd, path, &stbuf, 0) == -1) if (fstatat (basefd, path, &stbuf, 0) == -1)
{ {
if (errno == ENOENT) if (errno == ENOENT)
return 0; return 0;
else else
return -errno; return -errno;
} }
if (stbuf_is_regfile_hardlinked (&stbuf)) if (stbuf_is_regfile_hardlinked (&stbuf))
return -EROFS; return -EROFS;
return 0; return 0;
} }
#define VERIFY_WRITE(path) do { \ #define VERIFY_WRITE(path) do { \
int r = can_write (path); \ int r = can_write (path); \
if (r != 0) \ if (r != 0) \
return r; \ return r; \
} while (0) } while (0)
static int static int
@ -366,7 +366,7 @@ callback_read_buf (const char *path, struct fuse_bufvec **bufp,
static int static int
callback_read (const char *path, char *buf, size_t size, off_t offset, callback_read (const char *path, char *buf, size_t size, off_t offset,
struct fuse_file_info *finfo) struct fuse_file_info *finfo)
{ {
int r; int r;
r = pread (finfo->fh, buf, size, offset); r = pread (finfo->fh, buf, size, offset);
@ -390,7 +390,7 @@ callback_write_buf (const char *path, struct fuse_bufvec *buf, off_t offset,
static int static int
callback_write (const char *path, const char *buf, size_t size, off_t offset, callback_write (const char *path, const char *buf, size_t size, off_t offset,
struct fuse_file_info *finfo) struct fuse_file_info *finfo)
{ {
int r; int r;
r = pwrite (finfo->fh, buf, size, offset); r = pwrite (finfo->fh, buf, size, offset);
@ -438,14 +438,14 @@ callback_access (const char *path, int mode)
static int static int
callback_setxattr (const char *path, const char *name, const char *value, callback_setxattr (const char *path, const char *name, const char *value,
size_t size, int flags) size_t size, int flags)
{ {
return -ENOTSUP; return -ENOTSUP;
} }
static int static int
callback_getxattr (const char *path, const char *name, char *value, callback_getxattr (const char *path, const char *name, char *value,
size_t size) size_t size)
{ {
return -ENOTSUP; return -ENOTSUP;
} }
@ -503,8 +503,7 @@ struct fuse_operations callback_oper = {
.removexattr = callback_removexattr .removexattr = callback_removexattr
}; };
enum enum {
{
KEY_HELP, KEY_HELP,
KEY_VERSION, KEY_VERSION,
}; };
@ -513,19 +512,19 @@ static void
usage (const char *progname) usage (const char *progname)
{ {
fprintf (stdout, fprintf (stdout,
"usage: %s basepath mountpoint [options]\n" "usage: %s basepath mountpoint [options]\n"
"\n" "\n"
" Makes basepath visible at mountpoint such that files are read-only, directories are writable\n" " Makes basepath visible at mountpoint such that files are read-only, directories are writable\n"
"\n" "\n"
"general options:\n" "general options:\n"
" -o opt,[opt...] mount options\n" " -o opt,[opt...] mount options\n"
" -h --help print help\n" " -h --help print help\n"
"\n", progname); "\n", progname);
} }
static int static int
rofs_parse_opt (void *data, const char *arg, int key, rofs_parse_opt (void *data, const char *arg, int key,
struct fuse_args *outargs) struct fuse_args *outargs)
{ {
(void) data; (void) data;
@ -533,19 +532,19 @@ rofs_parse_opt (void *data, const char *arg, int key,
{ {
case FUSE_OPT_KEY_NONOPT: case FUSE_OPT_KEY_NONOPT:
if (basefd == -1) if (basefd == -1)
{ {
basefd = openat (AT_FDCWD, arg, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOCTTY); basefd = openat (AT_FDCWD, arg, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOCTTY);
if (basefd == -1) if (basefd == -1)
{ {
perror ("openat"); perror ("openat");
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
return 0; return 0;
} }
else else
{ {
return 1; return 1;
} }
case FUSE_OPT_KEY_OPT: case FUSE_OPT_KEY_OPT:
return 1; return 1;
case KEY_HELP: case KEY_HELP:

26
src/switchroot/ostree-prepare-root.c
View File

@ -6,8 +6,8 @@
* Based on code from util-linux/sys-utils/switch_root.c, * Based on code from util-linux/sys-utils/switch_root.c,
* Copyright 2002-2009 Red Hat, Inc. All rights reserved. * Copyright 2002-2009 Red Hat, Inc. All rights reserved.
* Authors: * Authors:
* Peter Jones <pjones@redhat.com> * Peter Jones <pjones@redhat.com>
* Jeremy Katz <katzj@redhat.com> * Jeremy Katz <katzj@redhat.com>
* *
* Relicensed with permission to LGPLv2+. * Relicensed with permission to LGPLv2+.
* *
@ -91,15 +91,15 @@ parse_ostree_cmdline (void)
const char *next = strchr (iter, ' '); const char *next = strchr (iter, ' ');
const char *next_nonspc = next; const char *next_nonspc = next;
while (next_nonspc && *next_nonspc == ' ') while (next_nonspc && *next_nonspc == ' ')
next_nonspc += 1; next_nonspc += 1;
if (strncmp (iter, "ostree=", strlen ("ostree=")) == 0) if (strncmp (iter, "ostree=", strlen ("ostree=")) == 0)
{ {
const char *start = iter + strlen ("ostree="); const char *start = iter + strlen ("ostree=");
if (next) if (next)
ret = strndup (start, next - start); ret = strndup (start, next - start);
else else
ret = strdup (start); ret = strdup (start);
break; break;
} }
iter = next_nonspc; iter = next_nonspc;
} }
@ -239,10 +239,10 @@ main(int argc, char *argv[])
* later boot and `systemd-remount-fs.service`. * later boot and `systemd-remount-fs.service`.
*/ */
if (path_is_on_readonly_fs (".")) if (path_is_on_readonly_fs ("."))
{ {
if (mount (".", ".", NULL, MS_REMOUNT | MS_SILENT, NULL) < 0) if (mount (".", ".", NULL, MS_REMOUNT | MS_SILENT, NULL) < 0)
err (EXIT_FAILURE, "failed to remount rootfs writable (for overlayfs)"); err (EXIT_FAILURE, "failed to remount rootfs writable (for overlayfs)");
} }
if (mount ("overlay", "usr", "overlay", 0, usr_ovl_options) < 0) if (mount ("overlay", "usr", "overlay", 0, usr_ovl_options) < 0)
err (EXIT_FAILURE, "failed to mount /usr overlayfs"); err (EXIT_FAILURE, "failed to mount /usr overlayfs");

4
src/switchroot/ostree-remount.c
View File

@ -85,13 +85,13 @@ main(int argc, char *argv[])
if (S_ISLNK (stbuf.st_mode)) if (S_ISLNK (stbuf.st_mode))
continue; continue;
if (mount (target, target, NULL, MS_REMOUNT | MS_SILENT, NULL) < 0) if (mount (target, target, NULL, MS_REMOUNT | MS_SILENT, NULL) < 0)
{ {
/* Also ignore ENINVAL - if the target isn't a mountpoint /* Also ignore ENINVAL - if the target isn't a mountpoint
* already, then assume things are OK. * already, then assume things are OK.
*/ */
if (errno != EINVAL) if (errno != EINVAL)
err (EXIT_FAILURE, "failed to remount %s", target); err (EXIT_FAILURE, "failed to remount %s", target);
} }
} }
maybe_mount_tmpfs_on_var (); maybe_mount_tmpfs_on_var ();

52
tests/readdir-rand.c
View File

@ -101,37 +101,37 @@ readdir (DIR *dirp)
errno = 0; errno = 0;
ret = real_readdir (dirp); ret = real_readdir (dirp);
if (ret == NULL && errno != 0) if (ret == NULL && errno != 0)
goto out; goto out;
g_mutex_lock (&direntcache_lock); g_mutex_lock (&direntcache_lock);
de = g_hash_table_lookup (direntcache, dirp); de = g_hash_table_lookup (direntcache, dirp);
if (ret) if (ret)
{ {
if (g_random_boolean ()) if (g_random_boolean ())
{ {
struct dirent *copy; struct dirent *copy;
if (!de) if (!de)
{ {
de = dir_entries_new (); de = dir_entries_new ();
g_hash_table_insert (direntcache, dirp, de); g_hash_table_insert (direntcache, dirp, de);
} }
copy = g_memdup (ret, sizeof (struct dirent)); copy = g_memdup (ret, sizeof (struct dirent));
g_ptr_array_add (de->entries, copy); g_ptr_array_add (de->entries, copy);
} }
else else
{ {
cache_another = FALSE; cache_another = FALSE;
} }
} }
else else
{ {
if (de && de->offset < de->entries->len) if (de && de->offset < de->entries->len)
{ {
ret = de->entries->pdata[de->offset]; ret = de->entries->pdata[de->offset];
de->offset++; de->offset++;
} }
cache_another = FALSE; cache_another = FALSE;
} }
g_mutex_unlock (&direntcache_lock); g_mutex_unlock (&direntcache_lock);
} }

2
tests/test-rollsum.c
View File

@ -152,7 +152,7 @@ test_bupsplit_sum(void)
sum1a = bupsplit_sum(buf, 0, BUP_SELFTEST_SIZE); sum1a = bupsplit_sum(buf, 0, BUP_SELFTEST_SIZE);
sum1b = bupsplit_sum(buf, 1, BUP_SELFTEST_SIZE); sum1b = bupsplit_sum(buf, 1, BUP_SELFTEST_SIZE);
sum2a = bupsplit_sum(buf, BUP_SELFTEST_SIZE - BUP_WINDOWSIZE*5/2, sum2a = bupsplit_sum(buf, BUP_SELFTEST_SIZE - BUP_WINDOWSIZE*5/2,
BUP_SELFTEST_SIZE - BUP_WINDOWSIZE); BUP_SELFTEST_SIZE - BUP_WINDOWSIZE);
sum2b = bupsplit_sum(buf, 0, BUP_SELFTEST_SIZE - BUP_WINDOWSIZE); sum2b = bupsplit_sum(buf, 0, BUP_SELFTEST_SIZE - BUP_WINDOWSIZE);
sum3a = bupsplit_sum(buf, 0, BUP_WINDOWSIZE+3); sum3a = bupsplit_sum(buf, 0, BUP_WINDOWSIZE+3);
sum3b = bupsplit_sum(buf, 3, BUP_WINDOWSIZE+3); sum3b = bupsplit_sum(buf, 3, BUP_WINDOWSIZE+3);