[dpdk-dev] [PATCH] drivers/virtio: fix duplicate naming of include guard

Maxime Coquelin maxime.coquelin at redhat.com
Thu Mar 21 10:26:12 CET 2019



On 3/21/19 8:59 AM, Tiwei Bie wrote:
> On Wed, Mar 20, 2019 at 01:57:39PM +0000, Andrius Sirvys wrote:
>> The LGTM static code analysis tool is reporting
>>
>> "The macro name '_VHOST_NET_USER_H' of this include guard is used
>> in 2 different header files."
>>
>> lib/librte_vhost/vhost_user.h has the same include guard.
>> Renamed the include guard in vhost.h to differentiate.
> 
> Above two files are private headers in two individual modules,
> there is no chance that they will be included by the same file.
> But I agree it's not a good name for any of them.
> 
>>
>> Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer")
>> Cc: jianfeng.tan at intel.com
>> Signed-off-by: Andrius Sirvys <andrius.sirvys at intel.com>
>> ---
>>   drivers/net/virtio/virtio_user/vhost.h | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h
>> index 83a85cc..f8d26b6 100644
>> --- a/drivers/net/virtio/virtio_user/vhost.h
>> +++ b/drivers/net/virtio/virtio_user/vhost.h
>> @@ -2,8 +2,8 @@
>>    * Copyright(c) 2010-2016 Intel Corporation
>>    */
>>   
>> -#ifndef _VHOST_NET_USER_H
>> -#define _VHOST_NET_USER_H
>> +#ifndef ANOTHER_VHOST_NET_USER_H
>> +#define ANOTHER_VHOST_NET_USER_H
> 
> If we want to change it, I prefer to change it to _PATH_NAME_,
> e.g. _VIRTIO_USER_VHOST_H_ or similar.

+1 for _VIRTIO_USER_VHOST_H_

> 
> Thanks,
> Tiwei
> 
>>   
>>   #include <stdint.h>
>>   #include <linux/types.h>
>> -- 
>> 2.7.4
>>


More information about the dev mailing list