tree-wide: drop duplicated blank lines
```
$ for i in */*.[ch] */*/*.[ch]; do sed -e '/^$/ {N; s/\n$//g}' -i $i; done
$ git checkout HEAD -- basic/linux shared/linux
```
This commit is contained in:
Yu Watanabe
committed by
Zbigniew Jędrzejewski-Szmek
Zbigniew Jędrzejewski-Szmek
parent
8eb0cafeb0
commit
8cec0a5c32
@@ -470,7 +470,6 @@ static inline long missing_set_mempolicy(int mode, const unsigned long *nodemask
|
||||
# define set_mempolicy missing_set_mempolicy
|
||||
#endif
|
||||
|
||||
|
||||
#if !HAVE_GET_MEMPOLICY
|
||||
static inline long missing_get_mempolicy(int *mode, unsigned long *nodemask,
|
||||
unsigned long maxnode, void *addr,
|
||||
|
||||
@@ -385,7 +385,6 @@ static int boot_entry_show(const BootEntry *e, bool show_as_default) {
|
||||
if (!t)
|
||||
return log_oom();
|
||||
|
||||
|
||||
ts = strv_split_newlines(t);
|
||||
if (!ts)
|
||||
return log_oom();
|
||||
@@ -394,7 +393,6 @@ static int boot_entry_show(const BootEntry *e, bool show_as_default) {
|
||||
if (!t2)
|
||||
return log_oom();
|
||||
|
||||
|
||||
printf(" options: %s\n", t2);
|
||||
}
|
||||
if (e->device_tree)
|
||||
|
||||
@@ -309,7 +309,6 @@ static int bus_socket_set_transient_property(
|
||||
&s->exec_command[ci],
|
||||
message, flags, error);
|
||||
|
||||
|
||||
if (streq(name, "Symlinks")) {
|
||||
_cleanup_strv_free_ char **l = NULL;
|
||||
char **p;
|
||||
|
||||
@@ -1554,7 +1554,6 @@ int job_get_after(Job *j, Job*** ret) {
|
||||
list[n++] = other->job;
|
||||
}
|
||||
|
||||
|
||||
HASHMAP_FOREACH_KEY(v, other, j->unit->dependencies[UNIT_AFTER], i) {
|
||||
if (!other->job)
|
||||
continue;
|
||||
|
||||
@@ -101,7 +101,6 @@ struct EntryObject EntryObject__contents;
|
||||
struct EntryObject__packed EntryObject__contents _packed_;
|
||||
assert_cc(sizeof(struct EntryObject) == sizeof(struct EntryObject__packed));
|
||||
|
||||
|
||||
struct HashItem {
|
||||
le64_t head_hash_offset;
|
||||
le64_t tail_hash_offset;
|
||||
|
||||
@@ -890,7 +890,6 @@ int bus_message_new_synthetic_error(
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
_public_ sd_bus_message* sd_bus_message_ref(sd_bus_message *m) {
|
||||
if (!m)
|
||||
return NULL;
|
||||
|
||||
@@ -402,7 +402,6 @@ int sd_netlink_message_append_sockaddr_in6(sd_netlink_message *m, unsigned short
|
||||
return netlink_message_append_sockaddr_union(m, type, (const union sockaddr_union *) data);
|
||||
}
|
||||
|
||||
|
||||
int sd_netlink_message_append_ether_addr(sd_netlink_message *m, unsigned short type, const struct ether_addr *data) {
|
||||
int r;
|
||||
|
||||
|
||||
@@ -182,7 +182,6 @@ static inline NetDevCreateType netdev_get_create_type(NetDev *netdev) {
|
||||
return NETDEV_VTABLE(netdev)->create_type;
|
||||
}
|
||||
|
||||
|
||||
CONFIG_PARSER_PROTOTYPE(config_parse_netdev_kind);
|
||||
|
||||
/* gperf */
|
||||
|
||||
@@ -349,7 +349,6 @@ int config_parse_fdb_vxlan_vni(
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int config_parse_fdb_ntf_flags(
|
||||
const char *unit,
|
||||
const char *filename,
|
||||
|
||||
@@ -273,7 +273,6 @@ static int oci_rlimits(const char *name, JsonVariant *v, JsonDispatchFlags flags
|
||||
{}
|
||||
};
|
||||
|
||||
|
||||
r = json_dispatch(e, table, oci_unexpected, flags, &data);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
@@ -366,7 +366,6 @@ int bus_wait_for_units_add_unit(
|
||||
if (r < 0)
|
||||
return log_debug_errno(r, "Failed to add reference to unit %s: %m", unit);
|
||||
|
||||
|
||||
item->flags |= BUS_WAIT_REFFED;
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@ enum {
|
||||
IMPORTER_STATE_EOF, /* done */
|
||||
};
|
||||
|
||||
|
||||
void journal_importer_cleanup(JournalImporter *imp) {
|
||||
if (imp->fd >= 0 && !imp->passive_fd) {
|
||||
log_debug("Closing %s (fd=%d)", imp->name ?: "importer", imp->fd);
|
||||
|
||||
@@ -431,7 +431,6 @@ static int output_short(
|
||||
if (priority_len == 1 && *priority >= '0' && *priority <= '7')
|
||||
p = *priority - '0';
|
||||
|
||||
|
||||
audit = streq_ptr(transport, "audit");
|
||||
|
||||
if (mode == OUTPUT_SHORT_MONOTONIC)
|
||||
|
||||
@@ -1874,7 +1874,6 @@ fail:
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
void varlink_detach_event(Varlink *v) {
|
||||
if (!v)
|
||||
return;
|
||||
|
||||
@@ -4673,7 +4673,6 @@ static int map_conditions(sd_bus *bus, const char *member, sd_bus_message *m, sd
|
||||
if (!c->name || !c->param)
|
||||
return -ENOMEM;
|
||||
|
||||
|
||||
LIST_PREPEND(conditions, i->conditions, TAKE_PTR(c));
|
||||
}
|
||||
if (r < 0)
|
||||
|
||||
@@ -54,7 +54,6 @@ int sd_id128_get_boot_app_specific(sd_id128_t app_id, sd_id128_t *ret);
|
||||
#define SD_ID128_MAKE(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) \
|
||||
((const sd_id128_t) SD_ID128_ARRAY(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15))
|
||||
|
||||
|
||||
/* Note that SD_ID128_FORMAT_VAL will evaluate the passed argument 16
|
||||
* times. It is hence not a good idea to call this macro with an
|
||||
* expensive function as parameter or an expression with side
|
||||
|
||||
@@ -747,7 +747,6 @@ static int run_tests(UnitFileScope scope, const test_entry tests[], char **patte
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
_cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL;
|
||||
_cleanup_free_ char *test_execute_path = NULL;
|
||||
|
||||
@@ -629,7 +629,6 @@ static void test_tempfn(void) {
|
||||
static const char chars[] =
|
||||
"Aąę„”\n루\377";
|
||||
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wtype-limits"
|
||||
|
||||
|
||||
@@ -170,7 +170,6 @@ static void test_proc_cmdline_get_key_many(void) {
|
||||
"doubleticks", &value6,
|
||||
"zummm", &value7) == 5);
|
||||
|
||||
|
||||
assert_se(streq_ptr(value1, "quux"));
|
||||
assert_se(!value2);
|
||||
assert_se(streq_ptr(value3, "tuet"));
|
||||
|
||||
@@ -385,7 +385,6 @@ int link_config_apply(link_config_ctx *ctx, link_config *config,
|
||||
if (r < 0)
|
||||
return log_device_warning_errno(device, r, "Could not find ifindex: %m");
|
||||
|
||||
|
||||
(void) link_unsigned_attribute(device, "name_assign_type", &name_type);
|
||||
|
||||
if (IN_SET(name_type, NET_NAME_USER, NET_NAME_RENAMED)
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
|
||||
#define RULES_DIRS (const char* const*) CONF_PATHS_STRV("udev/rules.d")
|
||||
|
||||
|
||||
typedef enum {
|
||||
OP_MATCH, /* == */
|
||||
OP_NOMATCH, /* != */
|
||||
@@ -176,7 +175,6 @@ struct UdevRules {
|
||||
LIST_HEAD(UdevRuleFile, rule_files);
|
||||
};
|
||||
|
||||
|
||||
/*** Logging helpers ***/
|
||||
|
||||
#define log_rule_full(device, rules, level, error, fmt, ...) \
|
||||
|
||||
Reference in New Issue
Block a user