1 files changed, 50 insertions, 50 deletions

diff --git a/src/version.c b/src/version.c
index e769e31..4b3a535 100644
--- a/src/version.c
+++ b/src/version.c
@@ -1,4 +1,4 @@
-/* grecs - Gray's Extensible Configuration System
+/* argot - Gray's Extensible Configuration System
    Copyright (C) 2007-2016 Sergey Poznyakoff
 
    Grecs is free software; you can redistribute it and/or modify it
@@ -17,22 +17,22 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-#include <grecs.h>
+#include <argot.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include "gitid.h"
 
-const char *grecs_vcs_id = "$Id: " GRECS_GIT_ID " $";
+const char *argot_vcs_id = "$Id: " ARGOT_GIT_ID " $";
 
-struct grecs_version_info *
-grecs_version_split(const char *vstr)
+struct argot_version_info *
+argot_version_split(const char *vstr)
 {
 	char *p;
 	size_t len;
-	struct grecs_version_info *pv = grecs_zalloc(sizeof(*pv));
+	struct argot_version_info *pv = argot_zalloc(sizeof(*pv));
 	
-	pv->buffer = grecs_strdup(vstr);
+	pv->buffer = argot_strdup(vstr);
 	len = strcspn(pv->buffer, " \t");
 	if (pv->buffer[len]) {
 		pv->package = pv->buffer;
@@ -67,62 +67,62 @@ grecs_version_split(const char *vstr)
 }
 
 void
-grecs_version_info_free(struct grecs_version_info *pv)
+argot_version_info_free(struct argot_version_info *pv)
 {
 	if (pv) {
 		if (pv->buffer)
-			grecs_free(pv->buffer);
+			argot_free(pv->buffer);
 		free(pv);
 	}
 }
 
-struct grecs_version_info *
-grecs_version(void)
+struct argot_version_info *
+argot_version(void)
 {
-	struct grecs_version_info *pv = grecs_zalloc(sizeof(*pv));
+	struct argot_version_info *pv = argot_zalloc(sizeof(*pv));
 	size_t size = 0;
 	
 	pv->package = PACKAGE_NAME;
-#ifdef GRECS_VERSION_PATCHLEVEL
-# ifdef GRECS_VERSION_SUFFIX
-	grecs_asprintf(&pv->buffer, &size,
+#ifdef ARGOT_VERSION_PATCHLEVEL
+# ifdef ARGOT_VERSION_SUFFIX
+	argot_asprintf(&pv->buffer, &size,
 		       "%d.%d.%d%s",
-		       GRECS_VERSION_MAJOR, GRECS_VERSION_MINOR,
-		       GRECS_VERSION_PATCHLEVEL, GRECS_VERSION_SUFFIX);
+		       ARGOT_VERSION_MAJOR, ARGOT_VERSION_MINOR,
+		       ARGOT_VERSION_PATCHLEVEL, ARGOT_VERSION_SUFFIX);
 # else
-	grecs_asprintf(&pv->buffer, &size,
+	argot_asprintf(&pv->buffer, &size,
 		       "%d.%d.%d",
-		       GRECS_VERSION_MAJOR, GRECS_VERSION_MINOR,
-		       GRECS_VERSION_PATCHLEVEL);
+		       ARGOT_VERSION_MAJOR, ARGOT_VERSION_MINOR,
+		       ARGOT_VERSION_PATCHLEVEL);
 # endif	
 #else
-# ifdef GRECS_VERSION_SUFFIX
-	grecs_asprintf(&pv->buffer, &size,
+# ifdef ARGOT_VERSION_SUFFIX
+	argot_asprintf(&pv->buffer, &size,
 		       "%d.%d%s",
-		       GRECS_VERSION_MAJOR, GRECS_VERSION_MINOR,
-		       GRECS_VERSION_SUFFIX);
+		       ARGOT_VERSION_MAJOR, ARGOT_VERSION_MINOR,
+		       ARGOT_VERSION_SUFFIX);
 # else
-	grecs_asprintf(&pv->buffer, &size,
+	argot_asprintf(&pv->buffer, &size,
 		       "%d.%d",
-		       GRECS_VERSION_MAJOR, GRECS_VERSION_MINOR);
+		       ARGOT_VERSION_MAJOR, ARGOT_VERSION_MINOR);
 # endif
 #endif
 	pv->version = pv->buffer;
-	pv->major = GRECS_VERSION_MAJOR;
-	pv->minor = GRECS_VERSION_MINOR;
-#ifdef GRECS_VERSION_PATCHLEVEL
-	pv->patch = GRECS_VERSION_PATCHLEVEL;
+	pv->major = ARGOT_VERSION_MAJOR;
+	pv->minor = ARGOT_VERSION_MINOR;
+#ifdef ARGOT_VERSION_PATCHLEVEL
+	pv->patch = ARGOT_VERSION_PATCHLEVEL;
 #endif
-#ifdef GRECS_VERSION_SUFFIX
-	pv->suffix = GRECS_VERSION_SUFFIX;
+#ifdef ARGOT_VERSION_SUFFIX
+	pv->suffix = ARGOT_VERSION_SUFFIX;
 #endif
-	pv->id = GRECS_GIT_ID;
+	pv->id = ARGOT_GIT_ID;
 	return pv;
 }
 
 int
-grecs_version_info_cmp(struct grecs_version_info *vx,
-		       struct grecs_version_info *vy,
+argot_version_info_cmp(struct argot_version_info *vx,
+		       struct argot_version_info *vy,
 		       int *pres)
 {
 	if (vx->package && vy->package && strcmp(vx->package, vy->package))
@@ -147,43 +147,43 @@ grecs_version_info_cmp(struct grecs_version_info *vx,
 }
 
 int
-grecs_version_cmp(const char *vstr1, const char *vstr2, int *pres)
+argot_version_cmp(const char *vstr1, const char *vstr2, int *pres)
 {
-	struct grecs_version_info *v1, *v2;
+	struct argot_version_info *v1, *v2;
 	int rc;
 	
 	if (!vstr1 || !vstr2)
 		return -1;
-	v1 = grecs_version_split(vstr1);
+	v1 = argot_version_split(vstr1);
 	if (!v1)
 		return -1;
-	v2 = grecs_version_split(vstr2);
+	v2 = argot_version_split(vstr2);
 	if (!v2) {
-		grecs_version_info_free(v1);
+		argot_version_info_free(v1);
 		return -1;
 	}
-	rc = grecs_version_info_cmp(v1, v2, pres);
-	grecs_version_info_free(v1);
-	grecs_version_info_free(v2);
+	rc = argot_version_info_cmp(v1, v2, pres);
+	argot_version_info_free(v1);
+	argot_version_info_free(v2);
 	return rc;
 }
 
 int
-grecs_version_ok(const char *vstr)
+argot_version_ok(const char *vstr)
 {
-	struct grecs_version_info *vmy, *vreq;
+	struct argot_version_info *vmy, *vreq;
 	int rc, res;
 	
 	if (!vstr)
 		return -1;
-	vreq = grecs_version_split(vstr);
+	vreq = argot_version_split(vstr);
 	if (!vreq)
 		return -1;
-	vmy = grecs_version();
+	vmy = argot_version();
 	if (vreq->suffix && !vmy->suffix)
 		vmy->suffix = "";
-	rc = grecs_version_info_cmp(vmy, vreq, &res);
-	grecs_version_info_free(vmy);
-	grecs_version_info_free(vreq);
+	rc = argot_version_info_cmp(vmy, vreq, &res);
+	argot_version_info_free(vmy);
+	argot_version_info_free(vreq);
 	return rc == 0 && res >= 0;
 }