use G_GNUC_NULL_TERMINATED instead of ATTRIBUTE_SENTINEL

Prefer G_GNUC_NULL_TERMINATED which was introduced in GLib 2.8.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 0ef8b563f59aea9778a99f96909f9936d748a26d..62edb665a7dd5155f468cfb721eb48b0b4224cba 100644 (file)
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -1159,7 +1159,7 @@ qemuAgentCommand(qemuAgentPtr mon,
     return ret;
 }
 
-static virJSONValuePtr ATTRIBUTE_SENTINEL
+static virJSONValuePtr G_GNUC_NULL_TERMINATED
 qemuAgentMakeCommand(const char *cmdname,
                      ...)
 {

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index dbc32acb5ef3d4eebb0d9373ea6a1631fafd8569..6818e726c63799f7484d015db9e2fd99a9139664 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -557,7 +557,7 @@ qemuMonitorJSONMakeCommandInternal(const char *cmdname,
 }
 
 
-static virJSONValuePtr ATTRIBUTE_SENTINEL
+static virJSONValuePtr G_GNUC_NULL_TERMINATED
 qemuMonitorJSONMakeCommand(const char *cmdname,
                            ...)
 {

diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h
index d5a7a8dc33bba9bb8d851cddccc6b0f658fb7f90..75e26c32fffa78c6c588efd0d198060735ab0d1e 100644 (file)
--- a/src/util/virbuffer.h
+++ b/src/util/virbuffer.h
@@ -77,7 +77,7 @@ void virBufferAsprintf(virBufferPtr buf, const char *format, ...)
 void virBufferVasprintf(virBufferPtr buf, const char *format, va_list ap)
   ATTRIBUTE_FMT_PRINTF(2, 0);
 void virBufferStrcat(virBufferPtr buf, ...)
-  ATTRIBUTE_SENTINEL;
+  G_GNUC_NULL_TERMINATED;
 void virBufferStrcatVArgs(virBufferPtr buf, va_list ap);
 
 void virBufferEscape(virBufferPtr buf, char escape, const char *toescape,

diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index 1a7158d4c1bdc297115aec7ac55e089ce256ef43..632d02bc7108a51d16a0cf88b620b91e2b14419c 100644 (file)
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -42,7 +42,7 @@ virCommandPtr virCommandNew(const char *binary) ATTRIBUTE_NONNULL(1);
 virCommandPtr virCommandNewArgs(const char *const*args) ATTRIBUTE_NONNULL(1);
 
 virCommandPtr virCommandNewArgList(const char *binary, ...)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL;
+    ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED;
 
 virCommandPtr virCommandNewVAList(const char *binary, va_list list)
     ATTRIBUTE_NONNULL(1);
@@ -137,7 +137,7 @@ void virCommandAddArgSet(virCommandPtr cmd,
 
 void virCommandAddArgList(virCommandPtr cmd,
                           ... /* const char *arg, ..., NULL */)
-    ATTRIBUTE_SENTINEL;
+    G_GNUC_NULL_TERMINATED;
 
 void virCommandSetWorkingDirectory(virCommandPtr cmd,
                                    const char *pwd) ATTRIBUTE_NONNULL(2);

diff --git a/src/util/virfile.h b/src/util/virfile.h
index 2b037b00aaa76e51d30c6debbd43cc8e583a7e44..f22380550cd1ae1415eef1d8c47e5bc5be3575ea 100644 (file)
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -317,7 +317,7 @@ char *virFileFindMountPoint(const char *type);
 /* NB: this should be combined with virFileBuildPath */
 #define virBuildPath(path, ...) \
     virBuildPathInternal(path, __VA_ARGS__, NULL)
-int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL;
+int virBuildPathInternal(char **path, ...) G_GNUC_NULL_TERMINATED;
 
 int virFilePrintf(FILE *fp, const char *msg, ...)
     ATTRIBUTE_FMT_PRINTF(2, 3);

diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h
index ff4626975bdae2773907d922811ea48b82cdd127..a2c0e9c26d8446d8981226e260a3226828003a29 100644 (file)
--- a/src/util/virfirewall.h
+++ b/src/util/virfirewall.h
@@ -65,7 +65,7 @@ virFirewallRulePtr virFirewallAddRuleFull(virFirewallPtr firewall,
                                           virFirewallQueryCallback cb,
                                           void *opaque,
                                           ...)
-    ATTRIBUTE_SENTINEL;
+    G_GNUC_NULL_TERMINATED;
 
 void virFirewallRemoveRule(virFirewallPtr firewall,
                            virFirewallRulePtr rule);
@@ -88,7 +88,7 @@ void virFirewallRuleAddArgSet(virFirewallPtr firewall,
 void virFirewallRuleAddArgList(virFirewallPtr firewall,
                                virFirewallRulePtr rule,
                                ...)
-    ATTRIBUTE_SENTINEL;
+    G_GNUC_NULL_TERMINATED;
 
 size_t virFirewallRuleGetArgCount(virFirewallRulePtr rule);
 

diff --git a/src/util/virjson.h b/src/util/virjson.h
index a5f959595ff0b7fcfb7b4699524f65fd2803f3c2..65b8d5620a47df906252665ec31da26073f33668 100644 (file)
--- a/src/util/virjson.h
+++ b/src/util/virjson.h
@@ -48,11 +48,11 @@ void virJSONValueHashFree(void *opaque, const void *name);
 virJSONType virJSONValueGetType(const virJSONValue *value);
 
 int virJSONValueObjectCreate(virJSONValuePtr *obj, ...)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL;
+    ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED;
 int virJSONValueObjectCreateVArgs(virJSONValuePtr *obj, va_list args)
     ATTRIBUTE_NONNULL(1);
 int virJSONValueObjectAdd(virJSONValuePtr obj, ...)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL;
+    ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED;
 int virJSONValueObjectAddVArgs(virJSONValuePtr obj, va_list args)
     ATTRIBUTE_NONNULL(1);
 

diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h
index 34cff1b2b3dd911b2611761c0bf4e4fa6ef9b253..2c998978ea250cab5401784a8475cdc9e50ba715 100644 (file)
--- a/src/util/virtypedparam.h
+++ b/src/util/virtypedparam.h
@@ -62,7 +62,7 @@ struct _virTypedParameterRemote {
 
 int virTypedParamsValidate(virTypedParameterPtr params, int nparams,
                            /* const char *name, int type ... */ ...)
-    ATTRIBUTE_SENTINEL ATTRIBUTE_RETURN_CHECK;
+    G_GNUC_NULL_TERMINATED ATTRIBUTE_RETURN_CHECK;
 
 bool virTypedParamsCheck(virTypedParameterPtr params,
                          int nparams,

diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h
index f116f9dd1fbd8a548fc15fa76614da7a06174798..7ebb34bb11685b8fe7d35fa0727f23589989a462 100644 (file)
--- a/src/vz/vz_utils.h
+++ b/src/vz/vz_utils.h
@@ -122,7 +122,7 @@ void vzDomObjFree(void *p);
 virDomainObjPtr vzDomObjFromDomain(virDomainPtr domain);
 
 char * vzGetOutput(const char *binary, ...)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL;
+    ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED;
 
 vzDriverPtr
 vzGetDriverConnection(void);

diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c
index b6961a986b2495201ee71316ca6753561465aefb..db14114cba9ff86441f9ce476d24c79e939e8f0d 100644 (file)
--- a/tests/domaincapstest.c
+++ b/tests/domaincapstest.c
@@ -27,7 +27,7 @@
 #define VIR_FROM_THIS VIR_FROM_NONE
 
 #if WITH_QEMU || WITH_BHYVE
-static int ATTRIBUTE_SENTINEL
+static int G_GNUC_NULL_TERMINATED
 fillStringValues(virDomainCapsStringValuesPtr values, ...)
 {
     int ret = 0;

diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h
index 75ea63382deca6230ca7dba42a1e4a779840a23f..2333fceed0138ef6b080fe3b0ae3bf14ced493f9 100644 (file)
--- a/tests/qemumonitortestutils.h
+++ b/tests/qemumonitortestutils.h
@@ -65,7 +65,7 @@ int qemuMonitorTestAddItemParams(qemuMonitorTestPtr test,
                                  const char *cmdname,
                                  const char *response,
                                  ...)
-    ATTRIBUTE_SENTINEL;
+    G_GNUC_NULL_TERMINATED;
 
 int qemuMonitorTestAddItemExpect(qemuMonitorTestPtr test,
                                  const char *cmdname,

diff --git a/tests/testutils.h b/tests/testutils.h
index 85ba9fbc0b7a539dc7142535e7e69f4e16393ac4..9099a776643b0f7b8f52fb82212173ab0ecf60c9 100644 (file)
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -48,9 +48,9 @@ int virTestRun(const char *title,
                const void *data);
 int virTestLoadFile(const char *file, char **buf);
 char *virTestLoadFilePath(const char *p, ...)
-    ATTRIBUTE_SENTINEL;
+    G_GNUC_NULL_TERMINATED;
 virJSONValuePtr virTestLoadFileJSON(const char *p, ...)
-    ATTRIBUTE_SENTINEL;
+    G_GNUC_NULL_TERMINATED;
 
 int virTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen);