git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff Hostetler <git@jeffhostetler.com>
To: Ramsay Jones <ramsay@ramsayjones.plus.com>,
	Jeff Hostetler <jeffhost@microsoft.com>
Cc: Junio C Hamano <gitster@pobox.com>,
	GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH] trace2: fix hdr-check warnings
Date: Tue, 5 Feb 2019 15:22:43 -0500	[thread overview]
Message-ID: <d91d1d89-5759-2006-7b38-4211db5988af@jeffhostetler.com> (raw)
In-Reply-To: <d680fda2-7e54-2200-cd00-97772de45b47@ramsayjones.plus.com>



On 2/4/2019 2:44 PM, Ramsay Jones wrote:
> 
> 
> On 30/01/2019 12:29, Jeff Hostetler wrote:
>>
>>
>> On 1/26/2019 4:07 PM, Ramsay Jones wrote:
>>>
>>> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
>>> ---
>>>
>>> Hi Jeff,
>>>
>>> If you need to re-roll your 'jh/trace2' branch, could you please
>>> squash this into the relevant patches (sorry, I didn't look to
>>> see which patches need to be modified).
>>
>> Will do. Thanks.
>>
>> BTW, how do you find these?  I ran both "make sparse" and
>> "make DEVELOPER=1" and it didn't complain about these items.
> 
> Carlo already replied about 'make hdr-check', but you seem to
> have missed squashing half of the original patch, since the
> re-rolled series still causes 'make -k hdr-check >phcout 2>&1'
> to show:
> 
>    $ diff nhcout phcout
>    22a23,34
>    >     HDR trace2/tr2_dst.h
>    >     HDR trace2/tr2_cfg.h
>    >     HDR trace2/tr2_tgt.h
>    >     HDR trace2/tr2_cmd_name.h
>    >     HDR trace2/tr2_sid.h
>    >     HDR trace2/tr2_tls.h
>    > trace2/tr2_tls.h:12:16: error: field ‘thread_name’ has incomplete type
>    >   struct strbuf thread_name;
>    >                 ^~~~~~~~~~~
>    > Makefile:2739: recipe for target 'trace2/tr2_tls.hco' failed
>    > make: *** [trace2/tr2_tls.hco] Error 1
>    >     HDR trace2/tr2_tbuf.h
>    131c143
>    < Makefile:2725: recipe for target 'sha256/gcrypt.hco' failed
>    ---
>    > Makefile:2739: recipe for target 'sha256/gcrypt.hco' failed
>    164a177
>    >     HDR trace2.h
>    $
> 
> So, quoting the last part of the original patch:
> 
> diff --git a/trace2/tr2_tls.h b/trace2/tr2_tls.h
> index 99ea9018ce..bb80e3f8e7 100644
> --- a/trace2/tr2_tls.h
> +++ b/trace2/tr2_tls.h
> @@ -1,6 +1,8 @@
>   #ifndef TR2_TLS_H
>   #define TR2_TLS_H
>   
> +#include "strbuf.h"
> +
>   /*
>    * Arbitry limit for thread names for column alignment.
>    */
> 

Yes, it appears I missed one.  I'll add it if I re-roll this.
(I hate to send a whole new version for one line.)

Thanks
Jeff

      reply	other threads:[~2019-02-05 20:22 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-26 21:07 [PATCH] trace2: fix hdr-check warnings Ramsay Jones
2019-01-30 12:29 ` Jeff Hostetler
2019-01-30 15:39   ` Carlo Arenas
2019-02-04 19:44   ` Ramsay Jones
2019-02-05 20:22     ` Jeff Hostetler [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d91d1d89-5759-2006-7b38-4211db5988af@jeffhostetler.com \
    --to=git@jeffhostetler.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jeffhost@microsoft.com \
    --cc=ramsay@ramsayjones.plus.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).