From c6dc104390496ad75ae3b2b7190461ce337839a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wolfgang=20St=C3=B6ggl?= Date: Mon, 11 Mar 2019 01:03:34 +0100 Subject: [PATCH] Add typenames to .indent.pro, add to EXTRA_DIST - Several typenames have been added in the meantime using typedef. Add them to .indent.pro - Add .indent.pro file to EXTRA_DIST, so that it is available in the tarball - re-indent src/rrd_xport.c with updated .indent.pro --- .indent.pro | 46 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 2 +- src/rrd_xport.c | 8 ++++---- 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/.indent.pro b/.indent.pro index 73401ef8..422a1c74 100644 --- a/.indent.pro +++ b/.indent.pro @@ -33,8 +33,13 @@ --case-brace-indentation0 --leave-preprocessor-space --no-tabs +/* Add all the typenames that are defined by typedef */ +-TCmdInfo -TFIFOqueue -TFnv32_t +-TRRDFUNC +-TRRD_FUNCTION +-TRRD_FUNCTION_V -TTcl_Interp -T_ArtRgbaSVPAlphaData -Tafm_fontinfo @@ -43,8 +48,16 @@ -Tafm_uint16 -Tafm_uint8 -Tafm_unicode +-Tcache_item_t +-Tcallback_flush_data_t +-Tcandidate_extra_t +-Tcandidate_selectfunc_t +-Tcandidate_t -Tcdp_prep_t -Tcgi_s +-Tcommand_t +-Tcompar_ex_t +-Tcoverage_t -Tds_def_t -Teps_font -Teps_state @@ -54,27 +67,59 @@ -Tgfx_node_t -Tgfx_string_s -Tgraph_desc_t +-Thw_functions_t -Timage_desc_t +-Timage_title_t -Tinfo_t -Tinfoval +-Tjournal_set +-Tkeyint_t +-Tkeyvalue_t +-Tlisten_socket_t -Tlive_head_t +-Tmapping_t +-Tmode_t -Toff_t -Told_afm_fontinfo +-Tparsedargs_t -Tpdf_buffer -Tpdf_font -Tpdf_point -Tpdf_state -Tpdp_prep_t +-Tqueue_side_t +-Tresponse_code -Trpn_cdefds_t -Trpnp_t -Trpnstack_t -Trra_def_t +-Trra_mod_op_t -Trra_ptr_t +-Trrd_blob_t +-Trrd_client_t +-Trrd_context_t +-Trrd_fetch_cb_t -Trrd_file_t +-Trrd_info_t +-Trrd_info_type_t +-Trrd_infoval_t +-Trrd_output_callback_t +-Trrd_rados_t +-Trrd_simple_file_t -Trrd_t +-Trrd_time_value_t +-Trrd_timetype_t -Trrd_value_t +-Trrdc_response_t +-Trrdc_stats_t +-Ts_cgi +-Ts_var +-Tssize_t -Tstat_head_t +-TstdioXmlReaderContext +-Tstring_arr -Tstring_arr_t +-Tstringbuffer_t -Tsvg_dash -Ttext_prop_t -Ttime_t @@ -82,6 +127,7 @@ -Tunival -Tva_list -Tvar_s +-Tvardata -Tvdef_t -Txlab_t -Tygrid_scale_t diff --git a/Makefile.am b/Makefile.am index c3e2c303..c8cbee4b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,7 @@ endif # the following files are not mentioned in any other Makefile EXTRA_DIST = COPYRIGHT CHANGES TODO CONTRIBUTORS THREADS VERSION LICENSE \ rrdtool.spec favicon.ico bootstrap \ - libtool \ + libtool .indent.pro \ m4/snprintf.m4 \ win32/build-rrdtool.dot win32/build-rrdtool.pdf win32/build-rrdtool.svg \ win32/librrd-4.def win32/librrd-4.rc win32/librrd-4.vcxproj \ diff --git a/src/rrd_xport.c b/src/rrd_xport.c index 98e54e95..f569784e 100644 --- a/src/rrd_xport.c +++ b/src/rrd_xport.c @@ -524,7 +524,7 @@ int rrd_graph_xport( } static int addToBuffer( - stringbuffer_t * sb, + stringbuffer_t *sb, char *data, size_t len) { @@ -583,7 +583,7 @@ static int addToBuffer( static int rrd_xport_format_sv( char sep, - stringbuffer_t * buffer, + stringbuffer_t *buffer, image_desc_t *im, time_t start, time_t end, @@ -674,7 +674,7 @@ static int rrd_xport_format_sv( static int rrd_xport_format_xmljson( int flags, - stringbuffer_t * buffer, + stringbuffer_t *buffer, image_desc_t *im, time_t start, time_t end, @@ -990,7 +990,7 @@ static void escapeJSON( static int rrd_xport_format_addprints( int flags, - stringbuffer_t * buffer, + stringbuffer_t *buffer, image_desc_t *im) { /* initialize buffer */ -- 2.47.2