From a60af3a5ee5d990c867ef190acfa81c180301ea2 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Mon, 17 Feb 2020 10:46:45 -0500 Subject: [PATCH] Cleanup: remove trailing white spaces across project Signed-off-by: Francis Deslauriers Signed-off-by: Mathieu Desnoyers Change-Id: I15202338465ee56d33316cbc632d9e3bf44ee31e --- doc/examples/easy-ust/Makefile | 2 +- doc/examples/easy-ust/sample.c | 4 +- .../easy-ust/sample_component_provider.h | 56 +++++++++---------- doc/examples/easy-ust/tp.c | 4 +- doc/examples/java-jul/Makefile | 2 +- include/lttng/tracepoint.h | 12 ++-- include/lttng/ust.h | 2 +- liblttng-ust/jhash.h | 10 ++-- .../lttng-ring-buffer-metadata-client.h | 1 - libringbuffer/ring_buffer_frontend.c | 2 +- snprintf/vfprintf.c | 2 +- 11 files changed, 48 insertions(+), 49 deletions(-) diff --git a/doc/examples/easy-ust/Makefile b/doc/examples/easy-ust/Makefile index 9e957ccf..a565b6a1 100644 --- a/doc/examples/easy-ust/Makefile +++ b/doc/examples/easy-ust/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 Matthew Khouzam +# Copyright (C) 2011-2012 Matthew Khouzam # Copyright (C) 2012 Mathieu Desnoyers # # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED diff --git a/doc/examples/easy-ust/sample.c b/doc/examples/easy-ust/sample.c index 4d19890b..416cb550 100644 --- a/doc/examples/easy-ust/sample.c +++ b/doc/examples/easy-ust/sample.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2012 Matthew Khouzam + * Copyright (C) 2011-2012 Matthew Khouzam * Copyright (C) 2012 Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy @@ -20,7 +20,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + #include /* diff --git a/doc/examples/easy-ust/sample_component_provider.h b/doc/examples/easy-ust/sample_component_provider.h index dd3c5f0f..16c1ee3c 100644 --- a/doc/examples/easy-ust/sample_component_provider.h +++ b/doc/examples/easy-ust/sample_component_provider.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2011-2012 Mathieu Desnoyers - * Copyright (C) 2011-2012 Matthew Khouzam + * Copyright (C) 2011-2012 Matthew Khouzam * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -20,9 +20,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ - + /* - * Sample lttng-ust tracepoint provider. + * Sample lttng-ust tracepoint provider. */ /* @@ -30,8 +30,8 @@ * We undef a macro before defining it as it can be used in several files. */ -/* - * Must be included before include tracepoint provider +/* + * Must be included before include tracepoint provider * ex.: project_event * ex.: project_component_event * @@ -58,69 +58,69 @@ #define _SAMPLE_COMPONENT_PROVIDER_H /* * Add this to allow programs to call "tracepoint(...): - */ -#include + */ +#include /* * The following tracepoint event writes a message (c string) into the * field message of the trace event message in the provider * sample_component in other words: * - * sample_component:message:message = text. + * sample_component:message:message = text. */ TRACEPOINT_EVENT( /* * provider name, not a variable but a string starting with a letter - * and containing either letters, numbers or underscores. + * and containing either letters, numbers or underscores. * Needs to be the same as TRACEPOINT_PROVIDER */ sample_component, /* - * tracepoint name, same format as sample provider. Does not need to be - * declared before. in this case the name is "message" + * tracepoint name, same format as sample provider. Does not need to be + * declared before. in this case the name is "message" */ message, /* - * TP_ARGS macro contains the arguments passed for the tracepoint + * TP_ARGS macro contains the arguments passed for the tracepoint * it is in the following format * TP_ARGS( type1, name1, type2, name2, ... type10, name10) - * where there can be from zero to ten elements. - * typeN is the datatype, such as int, struct or double **. - * name is the variable name (in "int myInt" the name would be myint) + * where there can be from zero to ten elements. + * typeN is the datatype, such as int, struct or double **. + * name is the variable name (in "int myInt" the name would be myint) * TP_ARGS() is valid to mean no arguments * TP_ARGS( void ) is valid too - */ + */ TP_ARGS(char *, text), /* - * TP_FIELDS describes how to write the fields of the trace event. + * TP_FIELDS describes how to write the fields of the trace event. * You can use the args here */ TP_FIELDS( /* * The ctf_string macro takes a c string and writes it into a field - * named "message" - */ + * named "message" + */ ctf_string(message, text) ) ) /* - * Trace loglevel, shows the level of the trace event. It can be TRACE_EMERG, - * TRACE_ALERT, TRACE_CRIT, TRACE_ERR, TRACE_WARNING, TRACE_INFO or others. + * Trace loglevel, shows the level of the trace event. It can be TRACE_EMERG, + * TRACE_ALERT, TRACE_CRIT, TRACE_ERR, TRACE_WARNING, TRACE_INFO or others. * If this is not set, TRACE_DEFAULT is assumed. * The first two arguments identify the tracepoint * See details in line 347 */ TRACEPOINT_LOGLEVEL( /* - * The provider name, must be the same as the provider name in the + * The provider name, must be the same as the provider name in the * TRACEPOINT_EVENT and as TRACEPOINT_PROVIDER above. */ - sample_component, - /* - * The tracepoint name, must be the same as the tracepoint name in the + sample_component, + /* + * The tracepoint name, must be the same as the tracepoint name in the * TRACEPOINT_EVENT */ - message, + message, /* * The tracepoint loglevel. Warning, some levels are abbreviated and * others are not, please see @@ -130,6 +130,6 @@ TRACEPOINT_LOGLEVEL( #endif /* _SAMPLE_COMPONENT_PROVIDER_H */ /* - * Add this after defining the tracepoint events to expand the macros. - */ + * Add this after defining the tracepoint events to expand the macros. + */ #include diff --git a/doc/examples/easy-ust/tp.c b/doc/examples/easy-ust/tp.c index b46de6f3..00aba14a 100644 --- a/doc/examples/easy-ust/tp.c +++ b/doc/examples/easy-ust/tp.c @@ -25,9 +25,9 @@ /* * Defining macro creates the code objects of the traceprobes, only do * it once per file - */ + */ #define TRACEPOINT_CREATE_PROBES /* - * The header containing our TRACEPOINT_EVENTs. + * The header containing our TRACEPOINT_EVENTs. */ #include "sample_component_provider.h" diff --git a/doc/examples/java-jul/Makefile b/doc/examples/java-jul/Makefile index 3eb68708..8597c7af 100644 --- a/doc/examples/java-jul/Makefile +++ b/doc/examples/java-jul/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2013 - David Goulet # # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED OR diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index d77a2fb2..a91faa42 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -580,7 +580,7 @@ __tracepoints__ptrs_destroy(void) * How to use the TRACEPOINT_EVENT macro: * * An example: - * + * * TRACEPOINT_EVENT(someproject_component, event_name, * * * TP_ARGS takes from 0 to 10 "type, field_name" pairs * @@ -591,23 +591,23 @@ __tracepoints__ptrs_destroy(void) * * TP_FIELDS describes the event payload layout in the trace * * * TP_FIELDS( - * * Integer, printed in base 10 * + * * Integer, printed in base 10 * * ctf_integer(int, field_a, arg0) * - * * Integer, printed with 0x base 16 * + * * Integer, printed with 0x base 16 * * ctf_integer_hex(unsigned long, field_d, arg1) * * * Enumeration * * ctf_enum(someproject_component, enum_name, int, field_e, arg0) * - * * Array Sequence, printed as UTF8-encoded array of bytes * + * * Array Sequence, printed as UTF8-encoded array of bytes * * ctf_array_text(char, field_b, string, FIXED_LEN) * ctf_sequence_text(char, field_c, string, size_t, strlen) * - * * String, printed as UTF8-encoded string * + * * String, printed as UTF8-encoded string * * ctf_string(field_e, string) * - * * Array sequence of signed integer values * + * * Array sequence of signed integer values * * ctf_array(long, field_f, arg4, FIXED_LEN4) * ctf_sequence(long, field_g, arg4, size_t, arg4_len) * ) diff --git a/include/lttng/ust.h b/include/lttng/ust.h index 7befe83c..06bceb74 100644 --- a/include/lttng/ust.h +++ b/include/lttng/ust.h @@ -43,7 +43,7 @@ extern void ust_after_setregid(void); extern void ust_after_setresuid(void); extern void ust_after_setresgid(void); -#ifdef __cplusplus +#ifdef __cplusplus } #endif diff --git a/liblttng-ust/jhash.h b/liblttng-ust/jhash.h index ace743bf..fe785bd5 100644 --- a/liblttng-ust/jhash.h +++ b/liblttng-ust/jhash.h @@ -65,19 +65,19 @@ do { \ * Returns a 32-bit value. Every bit of the key affects every bit of * the return value. Two keys differing by one or two bits will have * totally different hash values. - * + * * The best hash table sizes are powers of 2. There is no need to do * mod a prime (mod is sooo slow!). If you need less than 32 bits, * use a bitmask. For example, if you need only 10 bits, do * h = (h & hashmask(10)); * In which case, the hash table should have hashsize(10) elements. - * + * * If you are hashing n strings (uint8_t **)k, do it like this: * for (i = 0, h = 0; i < n; ++i) h = hashlittle(k[i], len[i], h); - * + * * By Bob Jenkins, 2006. bob_jenkins@burtleburtle.net. You may use this * code any way you wish, private, educational, or commercial. It's free. - * + * * Use for hash table lookup, or anything where one collision in 2^^32 is * acceptable. Do NOT use for cryptographic purposes. */ @@ -108,7 +108,7 @@ uint32_t hashlittle(const void *key, size_t length, uint32_t initval) } /*----------------------------- handle the last (probably partial) block */ - /* + /* * "k[2]&0xffffff" actually reads beyond the end of the string, but * then masks off the part it's not allowed to read. Because the * string is aligned, the masked-off tail is in the same word as the diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client.h b/liblttng-ust/lttng-ring-buffer-metadata-client.h index 05d3f1bb..1ca8b580 100644 --- a/liblttng-ust/lttng-ring-buffer-metadata-client.h +++ b/liblttng-ust/lttng-ring-buffer-metadata-client.h @@ -273,7 +273,6 @@ void lttng_event_write(struct lttng_ust_lib_ring_buffer_ctx *ctx, const void *sr static size_t lttng_packet_avail_size(struct channel *chan, struct lttng_ust_shm_handle *handle) - { unsigned long o_begin; struct lttng_ust_lib_ring_buffer *buf; diff --git a/libringbuffer/ring_buffer_frontend.c b/libringbuffer/ring_buffer_frontend.c index 7f73d03c..dd20852f 100644 --- a/libringbuffer/ring_buffer_frontend.c +++ b/libringbuffer/ring_buffer_frontend.c @@ -1155,7 +1155,7 @@ void channel_release(struct channel *chan, struct lttng_ust_shm_handle *handle, * Call "destroy" callback, finalize channels, decrement the channel * reference count. Note that when readers have completed data * consumption of finalized channels, get_subbuf() will return -ENODATA. - * They should release their handle at that point. + * They should release their handle at that point. */ void channel_destroy(struct channel *chan, struct lttng_ust_shm_handle *handle, int consumer) diff --git a/snprintf/vfprintf.c b/snprintf/vfprintf.c index 4ac63c3c..42ded30c 100644 --- a/snprintf/vfprintf.c +++ b/snprintf/vfprintf.c @@ -1351,7 +1351,7 @@ __grow_type_table(unsigned char **typetable, int *tablesize) return (0); } - + #ifdef FLOATING_POINT static int exponent(char *p0, int exp, int fmtch) -- 2.34.1