Merge pull request #11042 from yuwata/tiny-coding-style-fixes
Tiny coding style fixes
This commit is contained in:
commit
1e9e7196cb
|
@ -430,7 +430,7 @@ const char *special_glyph(SpecialGlyph code) {
|
|||
return draw_table[code >= _SPECIAL_GLYPH_FIRST_SMILEY ? emoji_enabled() : is_locale_utf8()][code];
|
||||
}
|
||||
|
||||
void locale_variables_free(char*l[_VARIABLE_LC_MAX]) {
|
||||
void locale_variables_free(char *l[_VARIABLE_LC_MAX]) {
|
||||
LocaleVariable i;
|
||||
|
||||
if (!l)
|
||||
|
|
|
@ -61,5 +61,5 @@ static inline int unit_name_mangle(const char *name, UnitNameMangle flags, char
|
|||
}
|
||||
|
||||
int slice_build_parent_slice(const char *slice, char **ret);
|
||||
int slice_build_subslice(const char *slice, const char*name, char **subslice);
|
||||
int slice_build_subslice(const char *slice, const char *name, char **subslice);
|
||||
bool slice_name_is_valid(const char *name);
|
||||
|
|
|
@ -306,7 +306,7 @@ void job_dependency_free(JobDependency *l) {
|
|||
free(l);
|
||||
}
|
||||
|
||||
void job_dump(Job *j, FILE*f, const char *prefix) {
|
||||
void job_dump(Job *j, FILE *f, const char *prefix) {
|
||||
assert(j);
|
||||
assert(f);
|
||||
|
||||
|
|
|
@ -166,7 +166,7 @@ void job_free(Job *job);
|
|||
Job* job_install(Job *j);
|
||||
int job_install_deserialized(Job *j);
|
||||
void job_uninstall(Job *j);
|
||||
void job_dump(Job *j, FILE*f, const char *prefix);
|
||||
void job_dump(Job *j, FILE *f, const char *prefix);
|
||||
int job_serialize(Job *j, FILE *f);
|
||||
int job_deserialize(Job *j, FILE *f);
|
||||
int job_coldplug(Job *j);
|
||||
|
|
|
@ -8,4 +8,4 @@ void server_process_audit_message(Server *s, const void *buffer, size_t buffer_s
|
|||
|
||||
void process_audit_string(Server *s, int type, const char *data, size_t size);
|
||||
|
||||
int server_open_audit(Server*s);
|
||||
int server_open_audit(Server *s);
|
||||
|
|
|
@ -433,7 +433,7 @@ void server_process_native_file(
|
|||
}
|
||||
}
|
||||
|
||||
int server_open_native_socket(Server*s) {
|
||||
int server_open_native_socket(Server *s) {
|
||||
|
||||
static const union sockaddr_union sa = {
|
||||
.un.sun_family = AF_UNIX,
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
int main(int argc, char *argv[]) {
|
||||
unsigned n = 0;
|
||||
_cleanup_(sd_journal_closep) sd_journal*j = NULL;
|
||||
_cleanup_(sd_journal_closep) sd_journal *j = NULL;
|
||||
|
||||
test_setup_logging(LOG_DEBUG);
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include "util.h"
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
_cleanup_(sd_journal_closep) sd_journal*j = NULL;
|
||||
_cleanup_(sd_journal_closep) sd_journal *j = NULL;
|
||||
_cleanup_free_ char *t;
|
||||
|
||||
test_setup_logging(LOG_DEBUG);
|
||||
|
|
|
@ -245,7 +245,7 @@ fail:
|
|||
return r;
|
||||
}
|
||||
|
||||
static void* client1(void*p) {
|
||||
static void* client1(void *p) {
|
||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
|
||||
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
|
||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||
|
@ -344,7 +344,7 @@ static int quit_callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_er
|
|||
return 1;
|
||||
}
|
||||
|
||||
static void* client2(void*p) {
|
||||
static void* client2(void *p) {
|
||||
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL, *reply = NULL;
|
||||
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
|
||||
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
||||
|
|
|
@ -505,7 +505,7 @@ static int localectl_main(sd_bus *bus, int argc, char *argv[]) {
|
|||
return dispatch_verb(argc, argv, verbs, bus);
|
||||
}
|
||||
|
||||
static int run(int argc, char*argv[]) {
|
||||
static int run(int argc, char *argv[]) {
|
||||
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
|
||||
int r;
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ struct Button {
|
|||
};
|
||||
|
||||
Button* button_new(Manager *m, const char *name);
|
||||
void button_free(Button*b);
|
||||
void button_free(Button *b);
|
||||
int button_open(Button *b);
|
||||
int button_set_seat(Button *b, const char *sn);
|
||||
int button_check_switches(Button *b);
|
||||
|
|
|
@ -65,7 +65,7 @@ static void print_inhibitors(sd_bus *bus) {
|
|||
printf("%u inhibitors\n", n);
|
||||
}
|
||||
|
||||
int main(int argc, char*argv[]) {
|
||||
int main(int argc, char *argv[]) {
|
||||
_cleanup_(sd_bus_unrefp) sd_bus *bus = NULL;
|
||||
int fd1, fd2;
|
||||
int r;
|
||||
|
|
|
@ -3099,7 +3099,7 @@ static int machinectl_main(int argc, char *argv[], sd_bus *bus) {
|
|||
return dispatch_verb(argc, argv, verbs, bus);
|
||||
}
|
||||
|
||||
static int run(int argc, char*argv[]) {
|
||||
static int run(int argc, char *argv[]) {
|
||||
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
|
||||
int r;
|
||||
|
||||
|
|
|
@ -497,7 +497,7 @@ static void test_dnssec_nsec3_hash(void) {
|
|||
|
||||
#endif
|
||||
|
||||
int main(int argc, char*argv[]) {
|
||||
int main(int argc, char *argv[]) {
|
||||
|
||||
test_dnssec_canonicalize();
|
||||
|
||||
|
|
|
@ -1095,7 +1095,7 @@ finish:
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int dns_name_build_suffix_table(const char *name, const char*table[]) {
|
||||
static int dns_name_build_suffix_table(const char *name, const char *table[]) {
|
||||
const char *p;
|
||||
unsigned n = 0;
|
||||
int r;
|
||||
|
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
#include "alloc-util.h"
|
||||
#include "ip-protocol-list.h"
|
||||
#include "macro.h"
|
||||
#include "parse-util.h"
|
||||
#include "string-util.h"
|
||||
#include "macro.h"
|
||||
|
||||
static const struct ip_protocol_name* lookup_ip_protocol(register const char *str, register GPERF_LEN_TYPE len);
|
||||
|
||||
|
|
|
@ -1028,7 +1028,7 @@ static int output_cat(
|
|||
|
||||
static int (*output_funcs[_OUTPUT_MODE_MAX])(
|
||||
FILE *f,
|
||||
sd_journal*j,
|
||||
sd_journal *j,
|
||||
OutputMode mode,
|
||||
unsigned n_columns,
|
||||
OutputFlags flags,
|
||||
|
|
|
@ -19,7 +19,7 @@ typedef enum PTYForwardFlags {
|
|||
PTY_FORWARD_IGNORE_INITIAL_VHANGUP = 4,
|
||||
} PTYForwardFlags;
|
||||
|
||||
typedef int (*PTYForwardHandler)(PTYForward *f, int rcode, void*userdata);
|
||||
typedef int (*PTYForwardHandler)(PTYForward *f, int rcode, void *userdata);
|
||||
|
||||
int pty_forward_new(sd_event *event, int master, PTYForwardFlags flags, PTYForward **f);
|
||||
PTYForward *pty_forward_free(PTYForward *f);
|
||||
|
|
|
@ -8686,7 +8686,7 @@ static int logind_cancel_shutdown(void) {
|
|||
#endif
|
||||
}
|
||||
|
||||
static int run(int argc, char*argv[]) {
|
||||
static int run(int argc, char *argv[]) {
|
||||
int r;
|
||||
|
||||
argv_cmdline = argv[0];
|
||||
|
|
|
@ -101,11 +101,11 @@ int sd_resolve_getaddrinfo(sd_resolve *resolve, sd_resolve_query **q, const char
|
|||
* if you want to query the hostname (resp. the service name). */
|
||||
int sd_resolve_getnameinfo(sd_resolve *resolve, sd_resolve_query **q, const struct sockaddr *sa, socklen_t salen, int flags, uint64_t get, sd_resolve_getnameinfo_handler_t callback, void *userdata);
|
||||
|
||||
sd_resolve_query *sd_resolve_query_ref(sd_resolve_query* q);
|
||||
sd_resolve_query *sd_resolve_query_unref(sd_resolve_query* q);
|
||||
sd_resolve_query *sd_resolve_query_ref(sd_resolve_query *q);
|
||||
sd_resolve_query *sd_resolve_query_unref(sd_resolve_query *q);
|
||||
|
||||
/* Returns non-zero when the query operation specified by q has been completed. */
|
||||
int sd_resolve_query_is_done(sd_resolve_query*q);
|
||||
int sd_resolve_query_is_done(sd_resolve_query *q);
|
||||
|
||||
void *sd_resolve_query_get_userdata(sd_resolve_query *q);
|
||||
void *sd_resolve_query_set_userdata(sd_resolve_query *q, void *userdata);
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include "string-util.h"
|
||||
#include "util.h"
|
||||
|
||||
int main(int argc, char*argv[]) {
|
||||
int main(int argc, char *argv[]) {
|
||||
char *path;
|
||||
char *c, *p;
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include "parse-util.h"
|
||||
#include "strv.h"
|
||||
|
||||
int main(int argc, char*argv[]) {
|
||||
int main(int argc, char *argv[]) {
|
||||
_cleanup_strv_free_ char **l = NULL;
|
||||
int n, i;
|
||||
usec_t duration = USEC_PER_SEC / 10;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#include "service.h"
|
||||
#include "unit.h"
|
||||
|
||||
int main(int argc, char*argv[]) {
|
||||
int main(int argc, char *argv[]) {
|
||||
JobType a, b, c, ab, bc, ab_c, bc_a, a_bc;
|
||||
const ServiceState test_states[] = { SERVICE_DEAD, SERVICE_RUNNING };
|
||||
unsigned i;
|
||||
|
|
|
@ -191,7 +191,7 @@ static void test_get_group_creds_one(const char *id, const char *name, gid_t gid
|
|||
assert_se(rgid == gid);
|
||||
}
|
||||
|
||||
int main(int argc, char*argv[]) {
|
||||
int main(int argc, char *argv[]) {
|
||||
test_uid_to_name_one(0, "root");
|
||||
test_uid_to_name_one(UID_NOBODY, NOBODY_USER_NAME);
|
||||
test_uid_to_name_one(0xFFFF, "65535");
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
#include "string-util.h"
|
||||
#include "util.h"
|
||||
|
||||
static int run(int argc, char*argv[]) {
|
||||
static int run(int argc, char *argv[]) {
|
||||
int r, k;
|
||||
|
||||
if (argc != 2)
|
||||
|
|
Loading…
Reference in a new issue