fix pg_attr

Vladimir Ershov · Vladimir Ershov · commit 637ae9c8997b · 2017-01-25T02:11:56.000-08:00
diff --git a/src/cron_string.c b/src/cron_string.c
@@ -4,6 +4,7 @@
 #include <stdarg.h>
 #include "cron_string.h"
 #include "postgres.h"
+#include "c.h"
 #include "port.h"
 
 
diff --git a/src/cron_string.h b/src/cron_string.h
@@ -5,6 +5,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include "postgres.h"
+#include "port.h"
 
 extern int cps_error;
 
@@ -41,7 +43,7 @@ typedef struct {
 } cron_ent_t;
 
 void destroyCronEnt(cron_ent_t *);
-void _cps_set_error(int num, const char *message, ...) __attribute__ ((format (gnu_printf, 2, 3)));;
+void _cps_set_error(int num, const char *message, ...) pg_attribute_printf(2, 3);
 char *get_cps_error(void);
 int _cps_string_has(char *str, char c);
 char *_cps_append_string(char *str, char *to_add);
diff --git a/src/pgpro_scheduler.c b/src/pgpro_scheduler.c
@@ -567,6 +567,7 @@ cron_string_to_json_text(PG_FUNCTION_ARGS)
 			elog(ERROR, "unknown error: %d", cps_error);
 		}
 	}
+	PG_RETURN_NULL();
 }
 
 
diff --git a/src/scheduler_job.h b/src/scheduler_job.h
@@ -7,6 +7,8 @@
 #include <stdarg.h>
 #include "utils/timestamp.h"
 #include "memutils.h"
+#include "c.h"
+#include "port.h"
 
 typedef struct {
 	int cron_id;
@@ -30,7 +32,8 @@ typedef struct {
 job_t *init_scheduler_job(job_t *j);
 job_t *get_expired_jobs(char *nodename, int *n, int *is_error);
 job_t *get_jobs_to_do(char *nodename, int *n, int *is_error);
-job_t *set_job_error(job_t *j, const char *fmt, ...) __attribute__ ((format (gnu_printf, 2, 3)));;
+/*job_t *set_job_error(job_t *j, const char *fmt, ...) __attribute__ ((format (gnu_printf, 2, 3)));;*/
+job_t *set_job_error(job_t *j, const char *fmt, ...) pg_attribute_printf(2, 3);
 int move_job_to_log(job_t *j, bool status);
 void destroy_job(job_t *j, int selfdestroy);
 

Original file line number	Diff line number	Diff line change
`@@ -567,6 +567,7 @@ cron_string_to_json_text(PG_FUNCTION_ARGS)`
`567`	`567`	`elog(ERROR, "unknown error: %d", cps_error);`
`568`	`568`	`}`
`569`	`569`	`}`
	`570`	`+ PG_RETURN_NULL();`
`570`	`571`	`}`
`571`	`572`
`572`	`573`