Module Name:    src
Committed By:   riastradh
Date:           Wed Aug  3 21:13:46 UTC 2022

Modified Files:
        src/common/lib/libprop: prop_array_util.c prop_data.c prop_dictionary.c
            prop_dictionary_util.c prop_kern.c prop_number.c prop_object.c
            prop_string.c

Log Message:
proplib: Nix trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/common/lib/libprop/prop_array_util.c \
    src/common/lib/libprop/prop_dictionary_util.c
cvs rdiff -u -r1.17 -r1.18 src/common/lib/libprop/prop_data.c
cvs rdiff -u -r1.44 -r1.45 src/common/lib/libprop/prop_dictionary.c
cvs rdiff -u -r1.24 -r1.25 src/common/lib/libprop/prop_kern.c
cvs rdiff -u -r1.33 -r1.34 src/common/lib/libprop/prop_number.c
cvs rdiff -u -r1.31 -r1.32 src/common/lib/libprop/prop_object.c
cvs rdiff -u -r1.16 -r1.17 src/common/lib/libprop/prop_string.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/common/lib/libprop/prop_array_util.c
diff -u src/common/lib/libprop/prop_array_util.c:1.8 src/common/lib/libprop/prop_array_util.c:1.9
--- src/common/lib/libprop/prop_array_util.c:1.8	Sun Jun 14 21:31:01 2020
+++ src/common/lib/libprop/prop_array_util.c	Wed Aug  3 21:13:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: prop_array_util.c,v 1.8 2020/06/14 21:31:01 christos Exp $	*/
+/*	$NetBSD: prop_array_util.c,v 1.9 2022/08/03 21:13:46 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2020 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@ prop_array_get_bool(prop_array_t array, 
 	b = prop_array_get(array, indx);
 	if (prop_object_type(b) != PROP_TYPE_BOOL)
 		return (false);
-	
+
 	*valp = prop_bool_true(b);
 
 	return (true);
Index: src/common/lib/libprop/prop_dictionary_util.c
diff -u src/common/lib/libprop/prop_dictionary_util.c:1.8 src/common/lib/libprop/prop_dictionary_util.c:1.9
--- src/common/lib/libprop/prop_dictionary_util.c:1.8	Mon Jun 15 00:46:00 2020
+++ src/common/lib/libprop/prop_dictionary_util.c	Wed Aug  3 21:13:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: prop_dictionary_util.c,v 1.8 2020/06/15 00:46:00 christos Exp $	*/
+/*	$NetBSD: prop_dictionary_util.c,v 1.9 2022/08/03 21:13:46 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2020 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@ prop_dictionary_get_bool(prop_dictionary
 	b = prop_dictionary_get(dict, key);
 	if (prop_object_type(b) != PROP_TYPE_BOOL)
 		return (false);
-	
+
 	*valp = prop_bool_true(b);
 
 	return (true);
@@ -179,7 +179,7 @@ prop_dictionary_get_string(prop_dictiona
 	cp = prop_string_value(str);
 	if (cp == NULL)
 		return (false);
-	
+
 	*cpp = cp;
 	return (true);
 }

Index: src/common/lib/libprop/prop_data.c
diff -u src/common/lib/libprop/prop_data.c:1.17 src/common/lib/libprop/prop_data.c:1.18
--- src/common/lib/libprop/prop_data.c:1.17	Mon Jun  8 21:31:56 2020
+++ src/common/lib/libprop/prop_data.c	Wed Aug  3 21:13:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: prop_data.c,v 1.17 2020/06/08 21:31:56 thorpej Exp $	*/
+/*	$NetBSD: prop_data.c,v 1.18 2022/08/03 21:13:46 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2020 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@ _prop_data_externalize(struct _prop_obje
 
 	if (_prop_object_externalize_end_tag(ctx, "data") == false)
 		return (false);
-	
+
 	return (true);
 }
 
@@ -377,7 +377,7 @@ prop_data_copy_value(prop_data_t pd, voi
 
 	if (! prop_object_is_data(pd))
 		return (false);
-	
+
 	if (buf == NULL || buflen < pd->pd_size)
 		return (false);
 
@@ -411,7 +411,7 @@ prop_data_data(prop_data_t pd)
 	v = _PROP_MALLOC(pd->pd_size, M_TEMP);
 	if (v != NULL)
 		memcpy(v, pd->pd_immutable, pd->pd_size);
-	
+
 	return (v);
 }
 
@@ -569,7 +569,7 @@ _prop_data_internalize_decode(struct _pr
 				return (false);
 			ch = (unsigned char) *src;
 			/* FALLTHROUGH */
-		
+
 		case 3:		/* Valid, two bytes of info */
 			/*
 			 * We know this char is a =.  Is there anything but
@@ -662,7 +662,7 @@ _prop_data_internalize(prop_stack_t stac
 	buf = _PROP_MALLOC(len + 1, M_PROP_DATA);
 	if (buf == NULL)
 		return (true);
-	
+
 	if (_prop_data_internalize_decode(ctx, buf, len + 1, &alen,
 					  &ctx->poic_cp) == false) {
 		_PROP_FREE(buf, M_PROP_DATA);

Index: src/common/lib/libprop/prop_dictionary.c
diff -u src/common/lib/libprop/prop_dictionary.c:1.44 src/common/lib/libprop/prop_dictionary.c:1.45
--- src/common/lib/libprop/prop_dictionary.c:1.44	Sat Jul  2 16:30:13 2022
+++ src/common/lib/libprop/prop_dictionary.c	Wed Aug  3 21:13:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: prop_dictionary.c,v 1.44 2022/07/02 16:30:13 andvar Exp $	*/
+/*	$NetBSD: prop_dictionary.c,v 1.45 2022/08/03 21:13:46 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2020 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@ static const struct _prop_object_type _p
 	.pot_equals		=	_prop_dictionary_equals,
 	.pot_equals_finish	=	_prop_dictionary_equals_finish,
 	.pot_lock 	        =       _prop_dictionary_lock,
-	.pot_unlock 	        =       _prop_dictionary_unlock,		
+	.pot_unlock 	        =       _prop_dictionary_unlock,
 };
 
 static _prop_object_free_rv_t
@@ -257,7 +257,7 @@ _prop_dict_keysym_externalize(struct _pr
 						pdk->pdk_key) == false ||
 	    _prop_object_externalize_end_tag(ctx, "string") == false)
 		return (false);
-	
+
 	return (true);
 }
 
@@ -448,7 +448,7 @@ _prop_dictionary_externalize(struct _pro
 	pi = _prop_dictionary_iterator_locked(pd);
 	if (pi == NULL)
 		goto out;
-	
+
 	ctx->poec_depth++;
 	_PROP_ASSERT(ctx->poec_depth != 0);
 
@@ -475,7 +475,7 @@ _prop_dictionary_externalize(struct _pro
 	}
 	if (_prop_object_externalize_end_tag(ctx, "dict") == false)
 		goto out;
-	
+
 	rv = true;
 
  out:
@@ -597,7 +597,7 @@ _prop_dictionary_expand(prop_dictionary_
 
 	if (oarray != NULL)
 		_PROP_FREE(oarray, M_PROP_DICT);
-	
+
 	return (true);
 }
 
@@ -1356,7 +1356,7 @@ _prop_dictionary_internalize_body(prop_s
 	if (_prop_object_internalize_find_tag(ctx, "key",
 				_PROP_TAG_TYPE_END) == false)
 		goto bad;
-   
+
 	/* ..and now the beginning of the value. */
 	if (_prop_object_internalize_find_tag(ctx, NULL,
 				_PROP_TAG_TYPE_START) == false)

Index: src/common/lib/libprop/prop_kern.c
diff -u src/common/lib/libprop/prop_kern.c:1.24 src/common/lib/libprop/prop_kern.c:1.25
--- src/common/lib/libprop/prop_kern.c:1.24	Sun Oct 14 17:37:40 2018
+++ src/common/lib/libprop/prop_kern.c	Wed Aug  3 21:13:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: prop_kern.c,v 1.24 2018/10/14 17:37:40 jdolecek Exp $	*/
+/*	$NetBSD: prop_kern.c,v 1.25 2022/08/03 21:13:46 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2009 The NetBSD Foundation, Inc.
@@ -143,7 +143,7 @@ _prop_object_send_ioctl(prop_object_t ob
 		error = errno;
 	else
 		error = 0;
-	
+
 	free(buf);
 
 	return (error);
@@ -162,7 +162,7 @@ prop_array_send_ioctl(prop_array_t array
 	if (rv != 0) {
 		errno = rv;	/* pass up error value in errno */
 		return rv;
-	} else 
+	} else
 		return 0;
 }
 
@@ -179,7 +179,7 @@ prop_dictionary_send_ioctl(prop_dictiona
 	if (rv != 0) {
 		errno = rv;	/* pass up error value in errno */
 		return rv;
-	} else 
+	} else
 		return 0;
 }
 
@@ -354,7 +354,7 @@ prop_dictionary_sendrecv_ioctl(prop_dict
 		error = errno;
 	else
 		error = 0;
-	
+
 	free(buf);
 
 	if (error != 0)

Index: src/common/lib/libprop/prop_number.c
diff -u src/common/lib/libprop/prop_number.c:1.33 src/common/lib/libprop/prop_number.c:1.34
--- src/common/lib/libprop/prop_number.c:1.33	Sat Jun  6 22:23:31 2020
+++ src/common/lib/libprop/prop_number.c	Wed Aug  3 21:13:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: prop_number.c,v 1.33 2020/06/06 22:23:31 thorpej Exp $	*/
+/*	$NetBSD: prop_number.c,v 1.34 2022/08/03 21:13:46 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2020 The NetBSD Foundation, Inc.
@@ -176,7 +176,7 @@ _prop_number_init(void)
 	return 0;
 }
 
-static void 
+static void
 _prop_number_lock(void)
 {
 	/* XXX: init necessary? */
@@ -189,7 +189,7 @@ _prop_number_unlock(void)
 {
 	_PROP_MUTEX_UNLOCK(_prop_number_tree_mutex);
 }
-	
+
 static bool
 _prop_number_externalize(struct _prop_object_externalize_context *ctx,
 			 void *v)
@@ -212,7 +212,7 @@ _prop_number_externalize(struct _prop_ob
 	    _prop_object_externalize_append_cstring(ctx, tmpstr) == false ||
 	    _prop_object_externalize_end_tag(ctx, "integer") == false)
 		return (false);
-	
+
 	return (true);
 }
 
@@ -571,7 +571,7 @@ prop_number_equals_signed(prop_number_t 
 	if (pn->pn_value.pnv_is_unsigned &&
 	    (pn->pn_value.pnv_unsigned > INTMAX_MAX || val < 0))
 		return (false);
-	
+
 	return (pn->pn_value.pnv_signed == val);
 }
 
@@ -595,11 +595,11 @@ prop_number_equals_unsigned(prop_number_
 
 	if (! prop_object_is_number(pn))
 		return (false);
-	
+
 	if (! pn->pn_value.pnv_is_unsigned &&
 	    (pn->pn_value.pnv_signed < 0 || val > INT64_MAX))
 		return (false);
-	
+
 	return (pn->pn_value.pnv_unsigned == val);
 }
 

Index: src/common/lib/libprop/prop_object.c
diff -u src/common/lib/libprop/prop_object.c:1.31 src/common/lib/libprop/prop_object.c:1.32
--- src/common/lib/libprop/prop_object.c:1.31	Wed May  8 04:34:33 2019
+++ src/common/lib/libprop/prop_object.c	Wed Aug  3 21:13:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: prop_object.c,v 1.31 2019/05/08 04:34:33 thorpej Exp $	*/
+/*	$NetBSD: prop_object.c,v 1.32 2022/08/03 21:13:46 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@ _prop_standalone_realloc(void *v, size_t
 		memcpy(rv, v, size);	/* XXX */
 		dealloc(v, 0);		/* XXX */
 	}
-	
+
 	return (rv);
 }
 #endif /* _STANDALONE */
@@ -116,7 +116,7 @@ _prop_object_externalize_start_tag(
 	    _prop_object_externalize_append_cstring(ctx, tag) == false ||
 	    _prop_object_externalize_append_char(ctx, '>') == false)
 		return (false);
-	
+
 	return (true);
 }
 
@@ -160,7 +160,7 @@ _prop_object_externalize_empty_tag(
 	    _prop_object_externalize_append_char(ctx, '>') == false ||
 	    _prop_object_externalize_append_char(ctx, '\n') == false)
 	    	return (false);
-	
+
 	return (true);
 }
 
@@ -429,7 +429,7 @@ _prop_object_internalize_find_tag(struct
 	    (taglen != ctx->poic_tagname_len ||
 	     memcmp(tag, ctx->poic_tagname, taglen) != 0))
 		return (false);
-	
+
 	/* Check for empty tag. */
 	if (*cp == '/') {
 		if (ctx->poic_tag_type != _PROP_TAG_TYPE_START)
@@ -470,14 +470,14 @@ _prop_object_internalize_find_tag(struct
 	}
 
 	ctx->poic_tagattr_len = cp - ctx->poic_tagattr;
-	
+
 	cp++;
 	if (*cp != '\"')
 		return (false);
 	cp++;
 	if (_PROP_EOF(*cp))
 		return (false);
-	
+
 	ctx->poic_tagattrval = cp;
 	while (*cp != '\"') {
 		if (_PROP_EOF(*cp))
@@ -485,7 +485,7 @@ _prop_object_internalize_find_tag(struct
 		cp++;
 	}
 	ctx->poic_tagattrval_len = cp - ctx->poic_tagattrval;
-	
+
 	cp++;
 	if (*cp != '>')
 		return (false);
@@ -507,7 +507,7 @@ _prop_object_internalize_decode_string(
 	const char *src;
 	size_t tarindex;
 	char c;
-	
+
 	tarindex = 0;
 	src = ctx->poic_cp;
 
@@ -566,7 +566,7 @@ _prop_object_internalize_decode_string(
 		*sizep = tarindex;
 	if (cpp != NULL)
 		*cpp = src;
-	
+
 	return (true);
 }
 
@@ -722,7 +722,7 @@ _prop_object_internalize_context_alloc(c
 			   M_TEMP);
 	if (ctx == NULL)
 		return (NULL);
-	
+
 	ctx->poic_xml = ctx->poic_cp = xml;
 
 	/*
@@ -805,12 +805,12 @@ _prop_object_externalize_file_dirname(co
 	 */
 	if (path == NULL || *path == '\0')
 		goto singledot;
-	
+
 	/* String trailing slashes, if any. */
 	lastp = path + strlen(path) - 1;
 	while (lastp != path && *lastp == '/')
 		lastp--;
-	
+
 	/* Terminate path at the last occurrence of '/'. */
 	do {
 		if (*lastp == '/') {
@@ -915,7 +915,7 @@ _prop_object_internalize_map_file(const 
 	mf = _PROP_MALLOC(sizeof(*mf), M_TEMP);
 	if (mf == NULL)
 		return (NULL);
-	
+
 	fd = open(fname, O_RDONLY, 0400);
 	if (fd == -1) {
 		_PROP_FREE(mf, M_TEMP);
@@ -1028,7 +1028,7 @@ prop_object_release_emergency(prop_objec
 
 		/* Save pointerto unlock function */
 		unlock = po->po_type->pot_unlock;
-		
+
 		/* Dance a bit to make sure we always get the non-racy ocnt */
 		_PROP_ATOMIC_DEC32_NV(&po->po_refcnt, ocnt);
 		ocnt++;
@@ -1039,8 +1039,8 @@ prop_object_release_emergency(prop_objec
 				unlock();
 			break;
 		}
-		
-		_PROP_ASSERT(po->po_type);		
+
+		_PROP_ASSERT(po->po_type);
 		if ((po->po_type->pot_free)(NULL, &obj) ==
 		    _PROP_OBJECT_FREE_DONE) {
 			if (unlock != NULL)
@@ -1050,7 +1050,7 @@ prop_object_release_emergency(prop_objec
 
 		if (unlock != NULL)
 			unlock();
-		
+
 		parent = po;
 		_PROP_ATOMIC_INC32(&po->po_refcnt);
 	}
@@ -1072,7 +1072,7 @@ prop_object_release(prop_object_t obj)
 {
 	struct _prop_object *po;
 	struct _prop_stack stack;
-	void (*unlock)(void); 
+	void (*unlock)(void);
 	int ret;
 	uint32_t ocnt;
 
@@ -1088,7 +1088,7 @@ prop_object_release(prop_object_t obj)
 
 			/* Save pointer to object unlock function */
 			unlock = po->po_type->pot_unlock;
-			
+
 			_PROP_ATOMIC_DEC32_NV(&po->po_refcnt, ocnt);
 			ocnt++;
 			_PROP_ASSERT(ocnt != 0);
@@ -1099,7 +1099,7 @@ prop_object_release(prop_object_t obj)
 					unlock();
 				break;
 			}
-			
+
 			ret = (po->po_type->pot_free)(&stack, &obj);
 
 			if (unlock != NULL)
@@ -1107,7 +1107,7 @@ prop_object_release(prop_object_t obj)
 
 			if (ret == _PROP_OBJECT_FREE_DONE)
 				break;
-			
+
 			_PROP_ATOMIC_INC32(&po->po_refcnt);
 		} while (ret == _PROP_OBJECT_FREE_RECURSE);
 		if (ret == _PROP_OBJECT_FREE_FAILED)
@@ -1163,7 +1163,7 @@ prop_object_equals_with_error(prop_objec
 
 	if (po1->po_type != po2->po_type)
 		return (false);
-    
+
  continue_subtree:
 	ret = (*po1->po_type->pot_equals)(obj1, obj2,
 					  &stored_pointer1, &stored_pointer2,
@@ -1195,7 +1195,7 @@ finish:
 		po1 = obj1;
 		(*po1->po_type->pot_equals_finish)(obj1, obj2);
 	}
-	return (false);		
+	return (false);
 }
 
 /*

Index: src/common/lib/libprop/prop_string.c
diff -u src/common/lib/libprop/prop_string.c:1.16 src/common/lib/libprop/prop_string.c:1.17
--- src/common/lib/libprop/prop_string.c:1.16	Tue Sep  7 13:24:45 2021
+++ src/common/lib/libprop/prop_string.c	Wed Aug  3 21:13:46 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: prop_string.c,v 1.16 2021/09/07 13:24:45 andvar Exp $	*/
+/*	$NetBSD: prop_string.c,v 1.17 2022/08/03 21:13:46 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2020 The NetBSD Foundation, Inc.
@@ -132,7 +132,7 @@ _prop_string_init(void)
 	_PROP_MUTEX_INIT(_prop_string_tree_mutex);
 	rb_tree_init(&_prop_string_tree,
 		     &_prop_string_rb_tree_ops);
-	
+
 	return 0;
 }
 
@@ -181,7 +181,7 @@ _prop_string_externalize(struct _prop_ob
 	    					ps->ps_immutable) == false ||
 	    _prop_object_externalize_end_tag(ctx, "string") == false)
 		return (false);
-	
+
 	return (true);
 }
 
@@ -388,7 +388,7 @@ prop_string_copy(prop_string_t ops)
 	cp = _PROP_MALLOC(ops->ps_size + 1, M_PROP_STRING);
 	if (cp == NULL)
 		return NULL;
-	
+
 	strcpy(cp, prop_string_contents(ops));
 
 	ps = _prop_string_instantiate(PS_F_MUTABLE, cp, ops->ps_size);
@@ -413,7 +413,7 @@ prop_string_copy_mutable(prop_string_t o
 	cp = _PROP_MALLOC(ops->ps_size + 1, M_PROP_STRING);
 	if (cp == NULL)
 		return NULL;
-	
+
 	strcpy(cp, prop_string_contents(ops));
 
 	ps = _prop_string_instantiate(PS_F_MUTABLE, cp, ops->ps_size);
@@ -451,7 +451,7 @@ prop_string_value(prop_string_t ps)
 
 	if ((ps->ps_flags & PS_F_MUTABLE) == 0)
 		return (ps->ps_immutable);
-	
+
 	return (prop_string_contents(ps));
 }
 
@@ -468,7 +468,7 @@ prop_string_copy_value(prop_string_t ps,
 
 	if (buf == NULL || buflen < ps->ps_size + 1)
 		return (false);
-	
+
 	strcpy(buf, prop_string_contents(ps));
 
 	return (true);
@@ -501,7 +501,7 @@ prop_string_cstring(prop_string_t ps)
 	cp = _PROP_MALLOC(ps->ps_size + 1, M_TEMP);
 	if (cp != NULL)
 		strcpy(cp, prop_string_contents(ps));
-	
+
 	return (cp);
 }
 
@@ -545,7 +545,7 @@ prop_string_append(prop_string_t dst, pr
 	dst->ps_size = len;
 	if (ocp != NULL)
 		_PROP_FREE(ocp, M_PROP_STRING);
-	
+
 	return (true);
 }
 
@@ -576,7 +576,7 @@ prop_string_append_cstring(prop_string_t
 	dst->ps_size = len;
 	if (ocp != NULL)
 		_PROP_FREE(ocp, M_PROP_STRING);
-	
+
 	return (true);
 }
 
@@ -663,7 +663,7 @@ _prop_string_internalize(prop_stack_t st
 		*obj = prop_string_create();
 		return (true);
 	}
-	
+
 	/* No attributes recognized here. */
 	if (ctx->poic_tagattr != NULL)
 		return (true);
@@ -672,11 +672,11 @@ _prop_string_internalize(prop_stack_t st
 	if (_prop_object_internalize_decode_string(ctx, NULL, 0, &len,
 						   NULL) == false)
 		return (true);
-	
+
 	str = _PROP_MALLOC(len + 1, M_PROP_STRING);
 	if (str == NULL)
 		return (true);
-	
+
 	if (_prop_object_internalize_decode_string(ctx, str, len, &alen,
 						   &ctx->poic_cp) == false ||
 	    alen != len) {
@@ -694,7 +694,7 @@ _prop_string_internalize(prop_stack_t st
 	string = _prop_string_instantiate(0, str, len);
 	if (string == NULL)
 		_PROP_FREE(str, M_PROP_STRING);
-	
+
 	*obj = string;
 	return (true);
 }

Reply via email to