lib: Fix various whitespace and indent issues (no functional change).
authorSascha Wildner <saw@online.de>
Fri, 9 Dec 2011 16:55:19 +0000 (17:55 +0100)
committerSascha Wildner <saw@online.de>
Fri, 9 Dec 2011 16:55:19 +0000 (17:55 +0100)
lib/libc/gen/seekdir.c
lib/libc/net/nscachedcli.c
lib/libc/resolv/res_mkupdate.c
lib/libc/string/strerror.c
lib/libdevattr/devattr_device.c
lib/libm/src/e_fmod.c
lib/libm/src/e_fmodf.c
lib/libstand/open.c
lib/libtelnet/read_password.c

index 0c43c5f..7f947db 100644 (file)
@@ -31,7 +31,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libc/gen/seekdir.c,v 1.2.8.1 2001/03/05 09:52:13 obrien Exp $
- * $DragonFly: src/lib/libc/gen/seekdir.c,v 1.6 2005/11/19 22:32:53 swildner Exp $
  *
  * @(#)seekdir.c       8.1 (Berkeley) 6/4/93
  */
@@ -53,7 +52,7 @@ seekdir(DIR *dirp, long loc)
 {
        if (__isthreaded)
                _pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
-       _seekdir(dirp, loc);
+       _seekdir(dirp, loc);
        if (__isthreaded)
                _pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
 }
index b6b1ca7..397169b 100644 (file)
@@ -347,11 +347,11 @@ __cached_read(struct cached_connection_ *connection, const char *entry_name,
        if (result != 0)
                goto fin;
 
-        if (result_size > *data_size) {
-                *data_size = result_size;
-                error_code = -2;
-                goto fin;
-        }
+       if (result_size > *data_size) {
+               *data_size = result_size;
+               error_code = -2;
+               goto fin;
+       }
 
        result = safe_read(connection, data, result_size);
        if (result != 0)
index e9b317a..47ce4c9 100644 (file)
@@ -247,7 +247,7 @@ res_nmkupdate(res_state statp, ns_updrec *rrecp_in, u_char *buf, int buflen) {
                        for (i = 0; i < 2; i++) {
                                if (!getword_str(buf2, sizeof buf2, &startp,
                                                 endp))
-                               return (-1);
+                                       return (-1);
                                n = dn_comp(buf2, cp, buflen,
                                            dnptrs, lastdnptr);
                                if (n < 0)
index bb89f57..f64418d 100644 (file)
@@ -28,7 +28,6 @@
  *
  * @(#)strerror.c      8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/string/strerror.c,v 1.16 2007/01/09 00:28:12 imp Exp $
- * $DragonFly: src/lib/libc/string/strerror.c,v 1.2 2003/06/17 04:26:46 dillon Exp $
  */
 
 #if defined(NLS)
@@ -119,6 +118,6 @@ strerror(int num)
        static char ebuf[NL_TEXTMAX];
 
        if (strerror_r(num, ebuf, sizeof(ebuf)) != 0)
-       errno = EINVAL;
+               errno = EINVAL;
        return (ebuf);
 }
index 1f26fd8..afbad12 100644 (file)
@@ -242,15 +242,17 @@ udev_device_get_property_value(struct udev_device *udev_device,
        if ((po = prop_dictionary_get(udev_device->dict, key)) == NULL)
                return NULL;
 
-               if (prop_object_type(po) == PROP_TYPE_STRING) {
+       if (prop_object_type(po) == PROP_TYPE_STRING) {
                ps = po;
                str = __DECONST(char *, prop_string_cstring_nocopy(ps));
        } else if (prop_object_type(po) == PROP_TYPE_NUMBER) {
                pn = po;
                if (prop_number_unsigned(pn)) {
-                       snprintf(buf, sizeof(buf), "%" PRIu64, prop_number_unsigned_integer_value(pn));
+                       snprintf(buf, sizeof(buf), "%" PRIu64,
+                           prop_number_unsigned_integer_value(pn));
                } else {
-                       snprintf(buf, sizeof(buf), "%" PRIi64, prop_number_integer_value(pn));
+                       snprintf(buf, sizeof(buf), "%" PRIi64,
+                           prop_number_integer_value(pn));
                }
                str = buf;
        }
index ff0edcc..bf98826 100644 (file)
@@ -10,7 +10,6 @@
  * ====================================================
  *
  * $NetBSD: e_fmod.c,v 1.11 2002/05/26 22:01:49 wiz Exp $
- * $DragonFly: src/lib/libm/src/e_fmod.c,v 1.1 2005/07/26 21:15:20 joerg Exp $
  */
 
 /*
@@ -96,9 +95,9 @@ fmod(double x, double y)
            hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
            if(hz<0){hx = hx+hx+(lx>>31); lx = lx+lx;}
            else {
-               if((hz|lz)==0)          /* return sign(x)*0 */
+               if((hz|lz)==0)          /* return sign(x)*0 */
                    return Zero[(u_int32_t)sx>>31];
-               hx = hz+hz+(lz>>31); lx = lz+lz;
+               hx = hz+hz+(lz>>31); lx = lz+lz;
            }
        }
        hz=hx-hy;lz=lx-ly; if(lx<ly) hz -= 1;
index 21b6c45..2314be9 100644 (file)
@@ -13,7 +13,6 @@
  * ====================================================
  *
  * $NetBSD: e_fmodf.c,v 1.7 2002/05/26 22:01:49 wiz Exp $
- * $DragonFly: src/lib/libm/src/e_fmodf.c,v 1.1 2005/07/26 21:15:20 joerg Exp $
  */
 
 /*
@@ -76,9 +75,9 @@ fmodf(float x, float y)
            hz=hx-hy;
            if(hz<0){hx = hx+hx;}
            else {
-               if(hz==0)               /* return sign(x)*0 */
+               if(hz==0)               /* return sign(x)*0 */
                    return Zero[(u_int32_t)sx>>31];
-               hx = hz+hz;
+               hx = hz+hz;
            }
        }
        hz=hx-hy;
index 5547c8e..8e31ec5 100644 (file)
@@ -1,5 +1,4 @@
 /* $FreeBSD: src/lib/libstand/open.c,v 1.2.6.1 2000/09/10 01:32:06 ps Exp $ */
-/* $DragonFly: src/lib/libstand/open.c,v 1.2 2003/06/17 04:26:51 dillon Exp $ */
 /*     $NetBSD: open.c,v 1.16 1997/01/28 09:41:03 pk Exp $     */
 
 /*-
@@ -139,7 +138,7 @@ open(const char *fname, int mode)
     if (error)
        devclose(f);
 
- err:
+err:
     f->f_flags = 0;
     errno = error;
     return (-1);
index d85582b..6e232a6 100644 (file)
@@ -32,7 +32,6 @@
  *
  * @(#)read_password.c 8.3 (Berkeley) 5/30/95
  * $FreeBSD: src/crypto/telnet/libtelnet/read_password.c,v 1.1.1.1.8.2 2002/04/13 10:59:07 markm Exp $
- * $DragonFly: src/crypto/telnet/libtelnet/read_password.c,v 1.2 2003/06/17 04:24:37 dillon Exp $
  */
 
 /*
@@ -115,7 +114,7 @@ local_des_read_pw_string(s,max,prompt,verify)
                continue;
            }
            if ((ptr = strchr(key_string, '\n')))
-           *ptr = '\0';
+                   *ptr = '\0';
            if (strcmp(s,key_string)) {
                printf("\n\07\07Mismatch - try again\n");
                (void) fflush(stdout);