[PATCH v2 01/30] access: Remove unused includes

Peng Liang posted 30 patches 3 years, 9 months ago
There is a newer version of this series
[PATCH v2 01/30] access: Remove unused includes
Posted by Peng Liang 3 years, 9 months ago
Signed-off-by: Peng Liang <tcx4c70@gmail.com>
---
 src/access/viraccessdriver.h       | 1 -
 src/access/viraccessdriverpolkit.c | 4 ----
 src/access/viraccessdriverstack.c  | 1 -
 src/access/viraccessmanager.h      | 1 -
 src/access/viraccessperm.h         | 1 -
 5 files changed, 8 deletions(-)

diff --git a/src/access/viraccessdriver.h b/src/access/viraccessdriver.h
index c1bccfe90f..f4bc4b6ced 100644
--- a/src/access/viraccessdriver.h
+++ b/src/access/viraccessdriver.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "conf/domain_conf.h"
 #include "access/viraccessmanager.h"
 
 typedef int (*virAccessDriverCheckConnectDrv)(virAccessManager *manager,
diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c
index c8d1421ad8..2473bd6258 100644
--- a/src/access/viraccessdriverpolkit.c
+++ b/src/access/viraccessdriverpolkit.c
@@ -21,13 +21,9 @@
 #include <config.h>
 
 #include "viraccessdriverpolkit.h"
-#include "viralloc.h"
-#include "vircommand.h"
 #include "virlog.h"
-#include "virprocess.h"
 #include "virerror.h"
 #include "virpolkit.h"
-#include "virstring.h"
 
 #define VIR_FROM_THIS VIR_FROM_ACCESS
 
diff --git a/src/access/viraccessdriverstack.c b/src/access/viraccessdriverstack.c
index e6fe285a54..fb9ea71665 100644
--- a/src/access/viraccessdriverstack.c
+++ b/src/access/viraccessdriverstack.c
@@ -22,7 +22,6 @@
 
 #include "viraccessdriverstack.h"
 #include "viralloc.h"
-#include "virerror.h"
 
 #define VIR_FROM_THIS VIR_FROM_ACCESS
 
diff --git a/src/access/viraccessmanager.h b/src/access/viraccessmanager.h
index 9e3da355da..2050ac9b85 100644
--- a/src/access/viraccessmanager.h
+++ b/src/access/viraccessmanager.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include "viridentity.h"
-#include "conf/domain_conf.h"
 #include "conf/network_conf.h"
 #include "conf/nwfilter_conf.h"
 #include "conf/node_device_conf.h"
diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h
index 051246a7b6..b0ee36ed3a 100644
--- a/src/access/viraccessperm.h
+++ b/src/access/viraccessperm.h
@@ -20,7 +20,6 @@
 
 #pragma once
 
-#include "internal.h"
 #include "virenum.h"
 
 typedef enum {
-- 
2.36.1
Re: [PATCH v2 01/30] access: Remove unused includes
Posted by Ján Tomko 3 years, 8 months ago
On a Saturday in 2022, Peng Liang wrote:
>Signed-off-by: Peng Liang <tcx4c70@gmail.com>
>---
> src/access/viraccessdriver.h       | 1 -
> src/access/viraccessdriverpolkit.c | 4 ----
> src/access/viraccessdriverstack.c  | 1 -
> src/access/viraccessmanager.h      | 1 -
> src/access/viraccessperm.h         | 1 -
> 5 files changed, 8 deletions(-)
>
>diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h
>index 051246a7b6..b0ee36ed3a 100644
>--- a/src/access/viraccessperm.h
>+++ b/src/access/viraccessperm.h
>@@ -20,7 +20,6 @@
>
> #pragma once
>
>-#include "internal.h"

While internal.h might be unused here, I'd rather not remove it.

Besides being very commonly used it also contains things for backward
compatibility with older Glib versions. If we forget to re-add it
later, libvirt might silently misbehave with older Glib.

Jano

> #include "virenum.h"
>
> typedef enum {
>-- 
>2.36.1
>
Re: [PATCH v2 01/30] access: Remove unused includes
Posted by Peng Liang 3 years, 8 months ago

On 6/7/2022 10:15 PM, Ján Tomko wrote:
> On a Saturday in 2022, Peng Liang wrote:
>> Signed-off-by: Peng Liang <tcx4c70@gmail.com>
>> ---
>> src/access/viraccessdriver.h       | 1 -
>> src/access/viraccessdriverpolkit.c | 4 ----
>> src/access/viraccessdriverstack.c  | 1 -
>> src/access/viraccessmanager.h      | 1 -
>> src/access/viraccessperm.h         | 1 -
>> 5 files changed, 8 deletions(-)
>>
>> diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h
>> index 051246a7b6..b0ee36ed3a 100644
>> --- a/src/access/viraccessperm.h
>> +++ b/src/access/viraccessperm.h
>> @@ -20,7 +20,6 @@
>>
>> #pragma once
>>
>> -#include "internal.h"
> 
> While internal.h might be unused here, I'd rather not remove it.
> 
> Besides being very commonly used it also contains things for backward
> compatibility with older Glib versions. If we forget to re-add it
> later, libvirt might silently misbehave with older Glib.
> 
> Jano

OK, I'll stop removing it in the next version.
And thanks for your reviewing!

Thanks,
Peng

> 
>> #include "virenum.h"
>>
>> typedef enum {
>> -- 
>> 2.36.1
>>