Skip to content

Commit

Permalink
codestyle: adjust trailing white space
Browse files Browse the repository at this point in the history
  • Loading branch information
pwithopf committed Nov 10, 2016
1 parent 52f78b4 commit bc7470b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions atomic.h
Expand Up @@ -12,19 +12,19 @@
* THESE MACROS MUST ONLY BE USED WITH WORD-SIZED DATA TYPES!
*
* Note: this file was obtained at 2015-12-16 from the rsyslog project.
*
*
* Copyright 2008-2015 Rainer Gerhards and Adiscon GmbH.
*
* This file is part of the rsyslog runtime library.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
* -or-
* see COPYING.ASL20 in the source distribution
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -54,7 +54,7 @@
/* functions below are not needed if we have atomics */
# define DEF_ATOMIC_HELPER_MUT(x)
# define INIT_ATOMIC_HELPER_MUT(x)
# define DESTROY_ATOMIC_HELPER_MUT(x)
# define DESTROY_ATOMIC_HELPER_MUT(x)
/* the following operations should preferrably be done atomic, but it is
* not fatal if not -- that means we can live with some missed updates. So be
Expand Down Expand Up @@ -185,7 +185,7 @@

#endif

/* we need to handle 64bit atomics seperately as some platforms have
/* we need to handle 64bit atomics seperately as some platforms have
* 32 bit atomics, but not 64 bit ones... -- rgerhards, 2010-12-01
*/
#if 0 /* currently disabled, we don't need it now and dont' have the data types present */
Expand All @@ -196,7 +196,7 @@

# define DEF_ATOMIC_HELPER_MUT64(x)
# define INIT_ATOMIC_HELPER_MUT64(x)
# define DESTROY_ATOMIC_HELPER_MUT64(x)
# define DESTROY_ATOMIC_HELPER_MUT64(x)
#else
# define ATOMIC_INC_uint64(data, phlpmut) { \
pthread_mutex_lock(phlpmut); \
Expand Down
2 changes: 1 addition & 1 deletion json_object.h
Expand Up @@ -323,7 +323,7 @@ extern void fjson_object_object_add(struct fjson_object* obj, const char *key,
* @param obj the fjson_object instance
* @param key the object field name (a private copy will be duplicated)
* @param val a fjson_object or NULL member to associate with the given field
* @param opts process-modifying options. To specify multiple options, use
* @param opts process-modifying options. To specify multiple options, use
* arithmetic or (OPT1|OPT2)
*/
extern void fjson_object_object_add_ex(struct fjson_object* obj, const char *key,
Expand Down

0 comments on commit bc7470b

Please sign in to comment.