summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
9237100)
#define. Renamed CMD_MAX to RRD_CMD_MAX and put into rrd_client.h
so that it is available to clients as well. -- kevin brintnall
git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2156
a5681a0c-68f1-0310-ab6d-
d61299d08faa
static int buffer_add_value (const char *value, /* {{{ */
char **buffer_ret, size_t *buffer_size_ret)
{
static int buffer_add_value (const char *value, /* {{{ */
char **buffer_ret, size_t *buffer_size_ret)
{
+ char temp[RRD_CMD_MAX];
if (strncmp (value, "N:", 2) == 0)
snprintf (temp, sizeof (temp), "%lu:%s",
if (strncmp (value, "N:", 2) == 0)
snprintf (temp, sizeof (temp), "%lu:%s",
static int buffer_add_ulong (const unsigned long value, /* {{{ */
char **buffer_ret, size_t *buffer_size_ret)
{
static int buffer_add_ulong (const unsigned long value, /* {{{ */
char **buffer_ret, size_t *buffer_size_ret)
{
+ char temp[RRD_CMD_MAX];
snprintf (temp, sizeof (temp), "%lu", value);
temp[sizeof (temp) - 1] = 0;
snprintf (temp, sizeof (temp), "%lu", value);
temp[sizeof (temp) - 1] = 0;
rrdc_response_t *ret = NULL;
int status = 0;
rrdc_response_t *ret = NULL;
int status = 0;
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t i;
char *buffer_ptr;
size_t i;
int rrdc_update (const char *filename, int values_num, /* {{{ */
const char * const *values)
{
int rrdc_update (const char *filename, int values_num, /* {{{ */
const char * const *values)
{
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
int rrdc_flush (const char *filename) /* {{{ */
{
int rrdc_flush (const char *filename) /* {{{ */
{
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
rrd_info_t * rrdc_info (const char *filename) /* {{{ */
{
rrd_info_t * rrdc_info (const char *filename) /* {{{ */
{
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
time_t rrdc_last (const char *filename) /* {{{ */
{
time_t rrdc_last (const char *filename) /* {{{ */
{
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
time_t rrdc_first (const char *filename, int rraindex) /* {{{ */
{
time_t rrdc_first (const char *filename, int rraindex) /* {{{ */
{
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
int argc,
const char **argv)
{
int argc,
const char **argv)
{
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
char ***ret_ds_names,
rrd_value_t **ret_data)
{
char ***ret_ds_names,
rrd_value_t **ret_data)
{
+ char buffer[RRD_CMD_MAX];
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
char *buffer_ptr;
size_t buffer_free;
size_t buffer_size;
typedef unsigned long long int uint64_t;
#endif
typedef unsigned long long int uint64_t;
#endif
+/* max length of socket command or response */
+#define RRD_CMD_MAX 4096
#ifndef RRDCACHED_DEFAULT_ADDRESS
# define RRDCACHED_DEFAULT_ADDRESS "unix:/tmp/rrdcached.sock"
#ifndef RRDCACHED_DEFAULT_ADDRESS
# define RRDCACHED_DEFAULT_ADDRESS "unix:/tmp/rrdcached.sock"
size_t files_num;
} journal_set;
size_t files_num;
} journal_set;
-/* max length of socket command or response */
-#define CMD_MAX 4096
-#define RBUF_SIZE (CMD_MAX*2)
+#define RBUF_SIZE (RRD_CMD_MAX*2)
static int add_response_info(listen_socket_t *sock, char *fmt, ...) /* {{{ */
{
va_list argp;
static int add_response_info(listen_socket_t *sock, char *fmt, ...) /* {{{ */
{
va_list argp;
+ char buffer[RRD_CMD_MAX];
int len;
if (JOURNAL_REPLAY(sock)) return 0;
int len;
if (JOURNAL_REPLAY(sock)) return 0;
char *fmt, ...) /* {{{ */
{
va_list argp;
char *fmt, ...) /* {{{ */
{
va_list argp;
+ char buffer[RRD_CMD_MAX];
int lines;
ssize_t wrote;
int rclen, len;
int lines;
ssize_t wrote;
int rclen, len;
char *file, file_tmp[PATH_MAX];
int values_num = 0;
int status;
char *file, file_tmp[PATH_MAX];
int values_num = 0;
int status;
- char orig_buf[CMD_MAX];
+ char orig_buf[RRD_CMD_MAX];
if (help && (help->syntax || help->help))
{
if (help && (help->syntax || help->help))
{
snprintf(tmp, sizeof(tmp)-1, "Help for %s\n", help->cmd);
resp_txt = tmp;
snprintf(tmp, sizeof(tmp)-1, "Help for %s\n", help->cmd);
resp_txt = tmp;
int entry_cnt = 0;
int fail_cnt = 0;
uint64_t line = 0;
int entry_cnt = 0;
int fail_cnt = 0;
uint64_t line = 0;
+ char entry[RRD_CMD_MAX];
time_t now;
if (file == NULL) return 0;
time_t now;
if (file == NULL) return 0;