Fix coding-style

doc/coding-style.txt

@@ -60,8 +60,8 @@ function(void *ptr, int value)
 
 	if (value > 10)
 		do_something(GLOBAL_MACRO, ptr, value, "some-string",
-	                     ref_ptr, ref_value, "other-string",
-	                     "extra-string");
+		             ref_ptr, ref_value, "other-string",
+		             "extra-string");
 }
 
 When wrapping, logical operators should be kept on the preceding line:

dpkg-deb/build.c

@@ -57,8 +57,8 @@
  */
 struct file_info {
   struct file_info *next;
-  struct stat	st;
-  char*	fn;
+  struct stat st;
+  char *fn;
 };
 
 static struct file_info *
@@ -108,7 +108,7 @@ file_info_get(const char *root, int fd)
   root_len = varbuf_printf(&fn, "%s/", root);
 
   while (1) {
-    int	res;
+    int res;
 
     varbuf_grow(&fn, 1);
     res = fd_read(fd, (fn.buf + fn.used), 1);

dpkg-deb/dpkg-deb.h

@@ -38,7 +38,7 @@ extern int debugflag, nocheckflag, oldformatflag;
 void extracthalf(const char *debar, const char *dir,
                  const char *taroption, int admininfo);
 
-extern const char* showformat;
+extern const char *showformat;
 extern struct compress_params compress_params;
 
 #define ARCHIVEVERSION		"2.0"

dpkg-deb/main.c

@@ -46,7 +46,7 @@
 
 #include "dpkg-deb.h"
 
-const char* showformat	= "${Package}\t${Version}\n";
+const char *showformat = "${Package}\t${Version}\n";
 
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *cip, const char *value)

dselect/basecmds.cc

@@ -143,8 +143,10 @@ void baselist::kd_search() {
     kd_searchagain();
 }
 
-void baselist::displayerror(const char* str) {
-  const char* pr = _("Error: ");
+void
+baselist::displayerror(const char *str)
+{
+  const char *pr = _("Error: ");
   int prlen=strlen(pr);
 
   beep();

dselect/dselect.h

@@ -99,7 +99,7 @@ protected:
   void unsizes();
   void dosearch();
   void displayhelp(const struct helpmenuentry *menu, int key);
-  void displayerror(const char* str);
+  void displayerror(const char *str);
 
   void redrawall();
   void redrawitemsrange(int start /*inclusive*/, int end /*exclusive*/);
@@ -152,7 +152,7 @@ public:
   void startdisplay();
   void enddisplay();
 
-  baselist(keybindings*);
+  baselist(keybindings *);
   virtual ~baselist();
 };
 

dselect/pkglist.cc

@@ -115,7 +115,7 @@ void packagelist::addheading(enum ssavailval ssavail,
   if (nitems == nallocated) {
     nallocated += nallocated+50;
     struct perpackagestate **newtable= new struct perpackagestate*[nallocated];
-    memcpy(newtable,table,nallocated*sizeof(struct perpackagestate*));
+    memcpy(newtable, table, nallocated * sizeof(struct perpackagestate *));
     delete[] table;
     table= newtable;
   }
@@ -147,8 +147,8 @@ void packagelist::addheading(enum ssavailval ssavail,
 static packagelist *sortpackagelist;
 
 int qsort_compareentries(const void *a, const void *b) {
-  return sortpackagelist->compareentries(*(const struct perpackagestate**)a,
-                                         *(const struct perpackagestate**)b);
+  return sortpackagelist->compareentries(*(const struct perpackagestate **)a,
+                                         *(const struct perpackagestate **)b);
 }
 
 void packagelist::sortinplace() {
@@ -545,7 +545,7 @@ packagelist::matchsearch(int index)
     return true;
 
   if (searchdescr) {
-    const char* descr = table[index]->pkg->available.description;
+    const char *descr = table[index]->pkg->available.description;
     if (!descr || !*descr)
       return false;
 

lib/dpkg/dpkg.h

@@ -130,10 +130,10 @@ void cu_closefd(int argc, void **argv);
 
 /*** from mlib.c ***/
 
-void setcloexec(int fd, const char* fn);
+void setcloexec(int fd, const char *fn);
 void *m_malloc(size_t);
 void *m_calloc(size_t);
-void *m_realloc(void*, size_t);
+void *m_realloc(void *, size_t);
 char *m_strdup(const char *str);
 char *m_strndup(const char *str, size_t n);
 int m_asprintf(char **strp, const char *fmt, ...) DPKG_ATTR_PRINTF(2);

lib/dpkg/dump.c

@@ -449,7 +449,7 @@ writerecord(FILE *file, const char *filename,
             pkgname.buf, filename);
   }
 
-   varbuf_destroy(&vb);
+  varbuf_destroy(&vb);
 }
 
 void

lib/dpkg/mlib.c

@@ -121,7 +121,9 @@ m_output(FILE *f, const char *name)
     ohshite(_("error writing to '%s'"), name);
 }
 
-void setcloexec(int fd, const char* fn) {
+void
+setcloexec(int fd, const char *fn)
+{
   int f;
 
   if ((f=fcntl(fd, F_GETFD))==-1)

lib/dpkg/options.c

@@ -63,8 +63,10 @@ config_error(const char *file_name, int line_num, const char *fmt, ...)
   ohshit(_("configuration error: %s:%d: %s"), file_name, line_num, buf);
 }
 
-void myfileopt(const char* fn, const struct cmdinfo* cmdinfos) {
-  FILE* file;
+void
+myfileopt(const char *fn, const struct cmdinfo *cmdinfos)
+{
+  FILE *file;
   int line_num = 0;
   char linebuf[MAX_CONFIG_LINE];
 
@@ -78,7 +80,7 @@ void myfileopt(const char* fn, const struct cmdinfo* cmdinfos) {
   }
 
   while (fgets(linebuf, sizeof(linebuf), file)) {
-    char* opt;
+    char *opt;
     const struct cmdinfo *cip;
     int l;
 
@@ -153,7 +155,7 @@ valid_config_filename(const struct dirent *dent)
 }
 
 static void
-load_config_dir(const char *prog, const struct cmdinfo* cmdinfos)
+load_config_dir(const char *prog, const struct cmdinfo *cmdinfos)
 {
   char *dirname;
   struct dirent **dlist;
@@ -184,7 +186,9 @@ load_config_dir(const char *prog, const struct cmdinfo* cmdinfos)
   free(dlist);
 }
 
-void loadcfgfile(const char *prog, const struct cmdinfo* cmdinfos) {
+void
+loadcfgfile(const char *prog, const struct cmdinfo *cmdinfos)
+{
   char *home, *file;
 
   load_config_dir(prog, cmdinfos);

lib/dpkg/options.h

@@ -52,7 +52,7 @@ void badusage(const char *fmt, ...) DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1);
 
 #define MAX_CONFIG_LINE 1024
 
-void myfileopt(const char* fn, const struct cmdinfo* cmdinfos);
+void myfileopt(const char *fn, const struct cmdinfo *cmdinfos);
 void myopt(const char *const **argvp, const struct cmdinfo *cmdinfos,
            const char *help_str);
 void loadcfgfile(const char *prog, const struct cmdinfo *cmdinfos);

scripts/t/200_Dpkg_Shlibs/patterns.cpp

@@ -13,7 +13,7 @@ namespace NSA
 		    void privmethod1(int);
 		    void privmethod2(int);
 	    };
-	    Private* p;
+	    Private *p;
 	    class Internal
 	    {
 		public:
@@ -22,11 +22,11 @@ namespace NSA
 		    void internal_method1(char);
 		    void internal_method2(char);
 	    };
-	    Internal* i;
+	    Internal *i;
 	public:
 	    ClassA();
 	    virtual ~ClassA();
-	    virtual void generate_vt(const char*) const;
+	    virtual void generate_vt(const char *) const;
     };
 
     EXPORT(ClassA::Private::Private());
@@ -41,7 +41,7 @@ namespace NSA
 
     EXPORT(ClassA::ClassA());
     EXPORT(ClassA::~ClassA());
-    EXPORT(void ClassA::generate_vt(const char*) const);
+    EXPORT(void ClassA::generate_vt(const char *) const);
 };
 
 class ClassB
@@ -49,24 +49,24 @@ class ClassB
     public:
 	ClassB();
 	virtual ~ClassB();
-	virtual void generate_vt(const char*) const;
+	virtual void generate_vt(const char *) const;
 };
 
 EXPORT(ClassB::ClassB());
 EXPORT(ClassB::~ClassB());
-EXPORT(void ClassB::generate_vt(const char*) const);
+EXPORT(void ClassB::generate_vt(const char *) const);
 
 class ClassC
 {
     public:
 	ClassC();
 	virtual ~ClassC();
-	virtual void generate_vt(const char*) const;
+	virtual void generate_vt(const char *) const;
 };
 
 EXPORT(ClassC::ClassC());
 EXPORT(ClassC::~ClassC());
-EXPORT(void ClassC::generate_vt(const char*) const);
+EXPORT(void ClassC::generate_vt(const char *) const);
 
 namespace NSB
 {
@@ -75,12 +75,12 @@ namespace NSB
 	public:
 	    ClassD();
 	    virtual ~ClassD();
-	    virtual void generate_vt(const char*) const;
+	    virtual void generate_vt(const char *) const;
     };
 
     EXPORT(ClassD::ClassD());
     EXPORT(ClassD::~ClassD());
-    EXPORT(void ClassD::generate_vt(const char*) const);
+    EXPORT(void ClassD::generate_vt(const char *) const);
 
     class Symver {
 	public:

src/filesdb.c

@@ -326,17 +326,17 @@ ensure_packagefiles_available(struct pkginfo *pkg)
 
   push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd);
 
-   if(fstat(fd, &stat_buf))
-     ohshite(_("unable to stat files list file for package '%.250s'"),
-             pkg_name(pkg, pnaw_nonambig));
+  if (fstat(fd, &stat_buf))
+    ohshite(_("unable to stat files list file for package '%.250s'"),
+            pkg_name(pkg, pnaw_nonambig));
 
   if (!S_ISREG(stat_buf.st_mode))
     ohshit(_("files list for package '%.250s' is not a regular file"),
            pkg_name(pkg, pnaw_nonambig));
 
-   if (stat_buf.st_size) {
-     loaded_list = nfmalloc(stat_buf.st_size);
-     loaded_list_end = loaded_list + stat_buf.st_size;
+  if (stat_buf.st_size) {
+    loaded_list = nfmalloc(stat_buf.st_size);
+    loaded_list_end = loaded_list + stat_buf.st_size;
 
     if (fd_read(fd, loaded_list, stat_buf.st_size) < 0)
       ohshite(_("reading files list for package '%.250s'"),

src/querycmd.c

@@ -63,7 +63,7 @@ static int getwidth(void) {
   int fd;
   int res;
   struct winsize ws;
-  const char* columns;
+  const char *columns;
 
   if ((columns=getenv("COLUMNS")) && ((res=atoi(columns))>0))
     return res;

src/statdb.c

@@ -48,7 +48,7 @@ static char *statoverridename;
 uid_t
 statdb_parse_uid(const char *str)
 {
-	char* endptr;
+	char *endptr;
 	uid_t uid;
 
 	if (str[0] == '#') {
@@ -59,7 +59,7 @@ statdb_parse_uid(const char *str)
 			ohshit(_("syntax error: invalid uid in statoverride file"));
 		uid = (uid_t)value;
 	} else {
-		struct passwd* pw = getpwnam(str);
+		struct passwd *pw = getpwnam(str);
 		if (pw == NULL)
 			ohshit(_("syntax error: unknown user '%s' in statoverride file"),
 			       str);
@@ -72,7 +72,7 @@ statdb_parse_uid(const char *str)
 gid_t
 statdb_parse_gid(const char *str)
 {
-	char* endptr;
+	char *endptr;
 	gid_t gid;
 
 	if (str[0] == '#') {
@@ -83,7 +83,7 @@ statdb_parse_gid(const char *str)
 			ohshit(_("syntax error: invalid gid in statoverride file"));
 		gid = (gid_t)value;
 	} else {
-		struct group* gr = getgrnam(str);
+		struct group *gr = getgrnam(str);
 		if (gr == NULL)
 			ohshit(_("syntax error: unknown group '%s' in statoverride file"),
 			       str);
@@ -96,7 +96,7 @@ statdb_parse_gid(const char *str)
 mode_t
 statdb_parse_mode(const char *str)
 {
-	char* endptr;
+	char *endptr;
 	long int mode;
 
 	mode = strtol(str, &endptr, 8);

utils/start-stop-daemon.c

@@ -958,7 +958,7 @@ init_procset(void)
 }
 
 static struct proc_stat *
-get_proc_stat (pid_t pid, ps_flags_t flags)
+get_proc_stat(pid_t pid, ps_flags_t flags)
 {
 	struct proc_stat *ps;
 	ps_flags_t wanted_flags = PSTAT_PID | flags;

utils/update-alternatives.c

@@ -347,9 +347,10 @@ xasprintf(char **strp, const char *fmt, ...)
 static void
 set_action(const char *new_action)
 {
-    if (action)
-	badusage(_("two commands specified: --%s and --%s"), action, new_action);
-    action = new_action;
+	if (action)
+		badusage(_("two commands specified: --%s and --%s"),
+		         action, new_action);
+	action = new_action;
 }
 
 static const char *
@@ -388,7 +389,7 @@ log_msg(const char *fmt, ...)
 
 		time(&now);
 		strftime(timestamp, sizeof(timestamp), "%Y-%m-%d %H:%M:%S",
-			 localtime(&now));
+		         localtime(&now));
 		fprintf(fh_log, "%s %s: ", PROGNAME, timestamp);
 		va_start(args, fmt);
 		vfprintf(fh_log, fmt, args);
@@ -1076,7 +1077,8 @@ alternative_remove_choice(struct alternative *a, const char *file)
 struct altdb_context {
 	FILE *fh;
 	char *filename;
-	void DPKG_ATTR_PRINTF(2) (*bad_format)(struct altdb_context *, const char *format, ...);
+	void DPKG_ATTR_PRINTF(2) (*bad_format)(struct altdb_context *,
+	                                       const char *format, ...);
 	jmp_buf on_error;
 };
 
@@ -1173,7 +1175,7 @@ alternative_parse_slave(struct alternative *a, struct altdb_context *ctx)
 		ctx->bad_format(ctx, _("slave link same as main link %s"),
 		                a->master_link);
 	}
-	for(sl = a->slaves; sl; sl = sl->next) {
+	for (sl = a->slaves; sl; sl = sl->next) {
 		if (strcmp(linkname, sl->link) == 0) {
 			free(linkname);
 			free(name);
@@ -1189,7 +1191,7 @@ alternative_parse_slave(struct alternative *a, struct altdb_context *ctx)
 
 static bool
 alternative_parse_fileset(struct alternative *a, struct altdb_context *ctx,
-			  bool *modified, bool must_not_die)
+                          bool *modified, bool must_not_die)
 {
 	struct fileset *fs;
 	struct slave_link *sl;
@@ -1617,7 +1619,7 @@ alternative_select_choice(struct alternative *a)
 
 static void
 alternative_add_commit_op(struct alternative *a, enum opcode opcode,
-			  const char *arg_a, const char *arg_b)
+                          const char *arg_a, const char *arg_b)
 {
 	struct commit_operation *op, *cur;
 
@@ -1723,7 +1725,7 @@ alternative_path_needs_update(const char *linkname, const char *filename)
 
 static void
 alternative_prepare_install_single(struct alternative *a, const char *name,
-				   const char *linkname, const char *file)
+                                   const char *linkname, const char *file)
 {
 	char *fntmp, *fn;
 
@@ -1920,7 +1922,8 @@ alternative_map_find(struct alternative_map *am, const char *key)
 }
 
 static void
-alternative_map_add(struct alternative_map *am, const char *key, struct alternative *a)
+alternative_map_add(struct alternative_map *am, const char *key,
+                    struct alternative *a)
 {
 	if (am->key == NULL) {
 		am->key = key;
@@ -1928,7 +1931,7 @@ alternative_map_add(struct alternative_map *am, const char *key, struct alternat
 	} else {
 		struct alternative_map *new = alternative_map_new(key, a);
 
-		while(am->next)
+		while (am->next)
 			am = am->next;
 		am->next = new;
 	}
@@ -2028,7 +2031,8 @@ alternative_set_selection(struct alternative_map *all, const char *name,
 	struct alternative *a;
 
 	debug("set_selection(%s, %s, %s)", name, status, choice);
-	if ((a = alternative_map_find(all, name))) {
+	a = alternative_map_find(all, name);
+	if (a) {
 		char *cmd;
 
 		if (strcmp(status, "auto") == 0) {
@@ -2052,7 +2056,8 @@ alternative_set_selection(struct alternative_map *all, const char *name,
 }
 
 static void
-alternative_set_selections(struct alternative_map *all, FILE* input, const char *desc)
+alternative_set_selections(struct alternative_map *all, FILE *input,
+                           const char *desc)
 {
 	for (;;) {
 		char line[1024], *res, *name, *status, *choice;
@@ -2121,8 +2126,9 @@ alternative_evolve(struct alternative *a, struct alternative *b,
 {
 	struct slave_link *sl;
 	struct stat st;
+	bool is_link;
 
-	bool is_link = (alternative_path_classify(a->master_link) == ALT_PATH_SYMLINK);
+	is_link = alternative_path_classify(a->master_link) == ALT_PATH_SYMLINK;
 	if (is_link && strcmp(a->master_link, b->master_link) != 0) {
 		info(_("renaming %s link from %s to %s."), b->master_name,
 		     a->master_link, b->master_link);