rename chunk option from -m to -a -- tobi

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2054 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/librrd.sym.in.in b/src/librrd.sym.in.in
index a4b9a08893d884914db27ab8689aa180e338bbac..3d63281859f59bf742118e5a1a40f070067a9aa1 100644 (file)
--- a/src/librrd.sym.in.in
+++ b/src/librrd.sym.in.in
@@ -1,5 +1,7 @@
 rrd_add_ptr
 rrd_add_strdup
+rrd_add_ptr_chunk
+rrd_add_strdup_chunk
 rrd_clear_error
 rrd_close
 rrd_create

diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index 9b8d9ee30cb59ae59d8d27de6b96f4b0a72cde95..ef6d83cb31fc86d7dcc28cad062d4cdba6249981 100644 (file)
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
@@ -2780,7 +2780,7 @@ static int read_options (int argc, char **argv) /* {{{ */
   gid_t  socket_group = (gid_t)-1;
   mode_t socket_permissions = (mode_t)-1;
 
-  while ((option = getopt(argc, argv, "gl:s:m:P:f:w:z:t:Bb:p:Fj:m:h?")) != -1)
+  while ((option = getopt(argc, argv, "gl:s:m:P:f:w:z:t:Bb:p:Fj:a:h?")) != -1)
   {
     switch (option)
     {
@@ -3088,7 +3088,7 @@ static int read_options (int argc, char **argv) /* {{{ */
       }
       break;
 
-      case 'm':
+      case 'a':
       {
         int temp = atoi(optarg);
         if (temp > 0)
@@ -3096,7 +3096,7 @@ static int read_options (int argc, char **argv) /* {{{ */
         else
         {
           fprintf(stderr, "Invalid allocation size: %s\n", optarg);
-          status = 10;
+          return 10;
         }
       }
       break;
@@ -3127,6 +3127,7 @@ static int read_options (int argc, char **argv) /* {{{ */
                             "for that group)\n"
             "  -m <mode>     File permissions (octal) of all following UNIX "
                             "sockets\n"
+            "  -a <size>     Memory allocation chunk size. Default is 1."
             "\n"
             "For more information and a detailed description of all options "
             "please refer\n"