* [PATCH] trace2: fix hdr-check warnings
@ 2019-01-26 21:07 Ramsay Jones
2019-01-30 12:29 ` Jeff Hostetler
0 siblings, 1 reply; 5+ messages in thread
From: Ramsay Jones @ 2019-01-26 21:07 UTC (permalink / raw)
To: Jeff Hostetler; +Cc: Junio C Hamano, GIT Mailing-list
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).
Thanks!
ATB,
Ramsay Jones
trace2/tr2_tgt.h | 4 ++++
trace2/tr2_tls.h | 2 ++
2 files changed, 6 insertions(+)
diff --git a/trace2/tr2_tgt.h b/trace2/tr2_tgt.h
index 4fdf253b57..8a46bbad4e 100644
--- a/trace2/tr2_tgt.h
+++ b/trace2/tr2_tgt.h
@@ -1,6 +1,10 @@
#ifndef TR2_TGT_H
#define TR2_TGT_H
+struct child_process;
+struct repository;
+struct json_writer;
+
/*
* Function prototypes for a TRACE2 "target" vtable.
*/
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.
*/
--
2.20.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] trace2: fix hdr-check warnings
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
0 siblings, 2 replies; 5+ messages in thread
From: Jeff Hostetler @ 2019-01-30 12:29 UTC (permalink / raw)
To: Ramsay Jones, Jeff Hostetler; +Cc: Junio C Hamano, GIT Mailing-list
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.
Jeff
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] trace2: fix hdr-check warnings
2019-01-30 12:29 ` Jeff Hostetler
@ 2019-01-30 15:39 ` Carlo Arenas
2019-02-04 19:44 ` Ramsay Jones
1 sibling, 0 replies; 5+ messages in thread
From: Carlo Arenas @ 2019-01-30 15:39 UTC (permalink / raw)
To: Jeff Hostetler
Cc: Ramsay Jones, Jeff Hostetler, Junio C Hamano, GIT Mailing-list
On Wed, Jan 30, 2019 at 4:30 AM Jeff Hostetler <git@jeffhostetler.com> wrote:
> BTW, how do you find these? I ran both "make sparse" and
> "make DEVELOPER=1" and it didn't complain about these items.
$ make hdr-check
available since ebb7baf02f ("Makefile: add a hdr-check target", 2018-09-19)
Carlo
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] trace2: fix hdr-check warnings
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
1 sibling, 1 reply; 5+ messages in thread
From: Ramsay Jones @ 2019-02-04 19:44 UTC (permalink / raw)
To: Jeff Hostetler, Jeff Hostetler; +Cc: Junio C Hamano, GIT Mailing-list
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.
*/
--
ATB,
Ramsay Jones
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] trace2: fix hdr-check warnings
2019-02-04 19:44 ` Ramsay Jones
@ 2019-02-05 20:22 ` Jeff Hostetler
0 siblings, 0 replies; 5+ messages in thread
From: Jeff Hostetler @ 2019-02-05 20:22 UTC (permalink / raw)
To: Ramsay Jones, Jeff Hostetler; +Cc: Junio C Hamano, GIT Mailing-list
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-02-05 20:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.