[libvirt] [PATCH v2] maint: prohibit empty first lines

Martin Kletzander mkletzan at redhat.com
Thu Jun 5 09:59:43 UTC 2014


On Wed, Jun 04, 2014 at 10:14:24AM -0600, Eric Blake wrote:
>On 06/04/2014 07:01 AM, Martin Kletzander wrote:
>> Based on discussion with Eric:
>>
>> https://www.redhat.com/archives/libvir-list/2014-March/msg01001.html
>>
>> Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
>> ---
>> v2:
>>  - rebase on current master and s/FILENAME:1:/FILENAME ":1:"/
>>
>>  cfg.mk | 7 +++++++
>>  1 file changed, 7 insertions(+)
>
>The existing sc_prohibit_empty_lines_at_EOF in maint.mk does a similar
>check but using perl instead of awk.  But that shouldn't matter.
>

Yeah, but that is taken from gnulib, isn't it?  Do you suggest
proposing this fix there?

>>
>> diff --git a/cfg.mk b/cfg.mk
>> index 675af21..80440b5 100644
>> --- a/cfg.mk
>> +++ b/cfg.mk
>> @@ -938,6 +938,13 @@ sc_require_locale_h:
>>  		fi;															\
>>  	done;
>>
>> +sc_prohibit_empty_first_line:
>> +	@awk 'BEGIN { fail=0; }                                        \
>> +	FNR == 1 { if ($$0 == "") { print FILENAME ":1:"; fail=1; } }     \
>
>why is this to stdout...
>

I wanted to simulate the behaviour of other syntax-check rules that
use grep without output redirection.  No problem of making this go to
stderr, though.

>> +	END { if (fail == 1) {                                         \
>> +	  print "$(ME): Prohibited empty first line" > "/dev/stderr";  \
>
>...but this to stderr?
>
>> +	} exit fail; }' $$($(VC_LIST_EXCEPT) | grep '\.[ch]$$');
>
>I'd use ALL of VC_LIST_EXCEPT (not just the .c and .h files).  But in
>general it looks like it does the right thing.
>

Michal had a good point of those other files.  I'll remove the grep,
add necessary files into except rule and fix all the other non-.[ch]
ones.

Thanks for the reviews
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140605/1067ea56/attachment-0001.sig>


More information about the libvir-list mailing list