coding style: fix lines over 80 chars

Lines should not go over 80 chars with a few exceptions:
	- headers
	- function definitions with only 1 argument
	- long strings, otherwise we break grep

This should go later in a coding-style file

diff --git a/TODO b/TODO
index 47fca61eff6ce77c3a7fa796654c7e3948c0ff45..533e81ef2ed8d3e6fe7b357dc753ada873ab48d9 100644 (file)
--- a/TODO
+++ b/TODO
@@ -28,3 +28,5 @@ Features:
    - return install/remove commands for non-modules:
          install nonexistentmodule somecommand
      modprobe nonexistentmodule -> runs somecommand
+
+* Add coding-style.txt

diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
index 0e4f92cb0bc6ed5163ae1dbade3cff082b622900..2b3222dd76da4fa9bfeb964ebcd7d7c76bcd76da 100644 (file)
--- a/libkmod/libkmod-config.c
+++ b/libkmod/libkmod-config.c
@@ -157,7 +157,8 @@ oom_error_init:
        return -ENOMEM;
 }
 
-static void kmod_config_free_options(struct kmod_config *config, struct kmod_list *l)
+static void kmod_config_free_options(struct kmod_config *config,
+                                                       struct kmod_list *l)
 {
        struct kmod_options *opt = l->data;
 
@@ -167,7 +168,7 @@ static void kmod_config_free_options(struct kmod_config *config, struct kmod_lis
 }
 
 static int kmod_config_add_alias(struct kmod_config *config,
-                               const char *name, const char *modname)
+                                       const char *name, const char *modname)
 {
        struct kmod_alias *alias;
        struct kmod_list *list;
@@ -196,7 +197,8 @@ oom_error_init:
        return -ENOMEM;
 }
 
-static void kmod_config_free_alias(struct kmod_config *config, struct kmod_list *l)
+static void kmod_config_free_alias(struct kmod_config *config,
+                                                       struct kmod_list *l)
 {
        struct kmod_alias *alias = l->data;
 
@@ -206,7 +208,7 @@ static void kmod_config_free_alias(struct kmod_config *config, struct kmod_list
 }
 
 static int kmod_config_add_blacklist(struct kmod_config *config,
-                                       const char *modname)
+                                                       const char *modname)
 {
        char *p;
        struct kmod_list *list;
@@ -452,7 +454,8 @@ fail_read:
        return NULL;
 }
 
-int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **p_config, const char * const *config_paths)
+int kmod_config_new(struct kmod_ctx *ctx, struct kmod_config **p_config,
+                                       const char * const *config_paths)
 {
        struct kmod_config *config;
        size_t i;

diff --git a/libkmod/libkmod-hash.c b/libkmod/libkmod-hash.c
index adc064c05e6f2c07171c964a0a5d1697645ef475..f3fd76589d973b26b0bf9ce7ebd07acb3c3829c7 100644 (file)
--- a/libkmod/libkmod-hash.c
+++ b/libkmod/libkmod-hash.c
@@ -43,7 +43,8 @@ struct kmod_hash {
        struct kmod_hash_bucket buckets[];
 };
 
-struct kmod_hash *kmod_hash_new(unsigned int n_buckets, void (*free_value)(void *value))
+struct kmod_hash *kmod_hash_new(unsigned int n_buckets,
+                                       void (*free_value)(void *value))
 {
        struct kmod_hash *hash = calloc(1, sizeof(struct kmod_hash) +
                                n_buckets * sizeof(struct kmod_hash_bucket));

diff --git a/libkmod/libkmod-list.c b/libkmod/libkmod-list.c
index 883a91a29c182ee0eef2e9eefd9040075fc5e1a8..9da1b6a3e6f7745d8209c4548d557d37325c655c 100644 (file)
--- a/libkmod/libkmod-list.c
+++ b/libkmod/libkmod-list.c
@@ -133,7 +133,8 @@ struct kmod_list *kmod_list_append(struct kmod_list *list, const void *data)
        return list ? list : new;
 }
 
-struct kmod_list *kmod_list_insert_after(struct kmod_list *list, const void *data)
+struct kmod_list *kmod_list_insert_after(struct kmod_list *list,
+                                                       const void *data)
 {
        struct kmod_list *new;
 
@@ -150,7 +151,8 @@ struct kmod_list *kmod_list_insert_after(struct kmod_list *list, const void *dat
        return list;
 }
 
-struct kmod_list *kmod_list_insert_before(struct kmod_list *list, const void *data)
+struct kmod_list *kmod_list_insert_before(struct kmod_list *list,
+                                                       const void *data)
 {
        struct kmod_list *new;
 
@@ -272,7 +274,7 @@ struct kmod_list *kmod_list_remove_n_latest(struct kmod_list *list,
  * the list or the list is empty.
  */
 KMOD_EXPORT struct kmod_list *kmod_list_prev(const struct kmod_list *list,
-                                                       const struct kmod_list *curr)
+                                               const struct kmod_list *curr)
 {
        if (list == NULL || curr == NULL)
                return NULL;
@@ -297,7 +299,7 @@ KMOD_EXPORT struct kmod_list *kmod_list_prev(const struct kmod_list *list,
  * list is empty.
  */
 KMOD_EXPORT struct kmod_list *kmod_list_next(const struct kmod_list *list,
-                                                       const struct kmod_list *curr)
+                                               const struct kmod_list *curr)
 {
        if (list == NULL || curr == NULL)
                return NULL;

diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index 620b2d50a77ced10fadd643e6f438e5658797125..ce01dc3314476d3b03f8cba64a11452a40d4c515 100644 (file)
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -93,7 +93,8 @@ static char *path_to_modname(const char *path, char buf[NAME_MAX], size_t *len)
        return modname_normalize(modname, buf, len);
 }
 
-static inline const char *path_join(const char *path, size_t prefixlen, char buf[PATH_MAX])
+static inline const char *path_join(const char *path, size_t prefixlen,
+                                                       char buf[PATH_MAX])
 {
        size_t pathlen;
 

diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 14c7a2c21263c7a9398f1a1c0d7ba1d8dab631c5..3abdca987212ba4d52b4c14d713596ca1e184d13 100644 (file)
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -196,7 +196,8 @@ static char *get_kernel_release(const char *dirname)
  *
  * Returns: a new kmod library context
  */
-KMOD_EXPORT struct kmod_ctx *kmod_new(const char *dirname, const char * const *config_paths)
+KMOD_EXPORT struct kmod_ctx *kmod_new(const char *dirname,
+                                       const char * const *config_paths)
 {
        const char *env;
        struct kmod_ctx *ctx;
@@ -545,7 +546,9 @@ fail:
  * Returns: 0 on success or < 0 otherwise. @output is saved with the updated
  * list.
  */
-KMOD_EXPORT int kmod_module_get_filtered_blacklist(const struct kmod_ctx *ctx, const struct kmod_list *input, struct kmod_list **output)
+KMOD_EXPORT int kmod_module_get_filtered_blacklist(const struct kmod_ctx *ctx,
+                                               const struct kmod_list *input,
+                                               struct kmod_list **output)
 {
        const struct kmod_config *config;
        const struct kmod_list *li;
@@ -640,7 +643,9 @@ KMOD_EXPORT void kmod_unload_resources(struct kmod_ctx *ctx)
        }
 }
 
-KMOD_EXPORT int kmod_resolve_alias_options(struct kmod_ctx *ctx, const char *given_alias, char **options)
+KMOD_EXPORT int kmod_resolve_alias_options(struct kmod_ctx *ctx,
+                                               const char *given_alias,
+                                               char **options)
 {
        struct kmod_list *modules = NULL, *l;
        char alias[NAME_MAX];