Merge branch 'collectd-4.2' into collectd-4.3

diff --combined src/hddtemp.c
index 8c4bc4a,1047077..651de29
--- 1/src/hddtemp.c
--- 2/src/hddtemp.c
+++ b/src/hddtemp.c
@@@ -48,9 -48,9 +48,9 @@@ static const char *config_keys[] 
  {
        "Host",
        "Port",
 -      NULL
 +      "TranslateDevicename"
  };
 -static int config_keys_num = 2;
 +static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
  
  typedef struct hddname
  {
@@@ -63,7 -63,6 +63,7 @@@
  static hddname_t *first_hddname = NULL;
  static char *hddtemp_host = NULL;
  static char hddtemp_port[16];
 +static int translate_devicename = 1;
  
  /*
   * NAME
@@@ -224,15 -223,6 +224,15 @@@ static int hddtemp_config (const char *
                        strncpy (hddtemp_port, value, sizeof (hddtemp_port));
                hddtemp_port[sizeof (hddtemp_port) - 1] = '\0';
        }
 +      else if (strcasecmp (key, "TranslateDevicename") == 0)
 +      {
 +              if ((strcasecmp ("true", value) == 0)
 +                              || (strcasecmp ("yes", value) == 0)
 +                              || (strcasecmp ("on", value) == 0))
 +                      translate_devicename = 1;
 +              else
 +                      translate_devicename = 0;
 +      }
        else
        {
                return (-1);
@@@ -314,6 -304,7 +314,7 @@@ static int hddtemp_init (void
                                case SCSI_DISK5_MAJOR:
                                case SCSI_DISK6_MAJOR:
                                case SCSI_DISK7_MAJOR:
+ #ifdef SCSI_DISK8_MAJOR
                                case SCSI_DISK8_MAJOR:
                                case SCSI_DISK9_MAJOR:
                                case SCSI_DISK10_MAJOR:
@@@ -322,6 -313,7 +323,7 @@@
                                case SCSI_DISK13_MAJOR:
                                case SCSI_DISK14_MAJOR:
                                case SCSI_DISK15_MAJOR:
+ #endif /* SCSI_DISK8_MAJOR */
                                        /* SCSI disks minors are multiples of 16.
                                         * Keep only those. */
                                        if (minor % 16)
@@@ -398,14 -390,14 +400,14 @@@
  } /* int hddtemp_init */
  
  /*
 - * hddtemp_get_name
 + * hddtemp_get_major_minor
   *
   * Description:
   *   Try to "cook" a bit the drive name as returned
   *   by the hddtemp daemon. The intend is to transform disk
   *   names into <major>-<minor> when possible.
   */
 -static char *hddtemp_get_name (char *drive)
 +static char *hddtemp_get_major_minor (char *drive)
  {
        hddname_t *list;
        char *ret;
@@@ -480,7 -472,7 +482,7 @@@ static int hddtemp_read (void
  
        for (i = 0; i < num_disks; i++)
        {
 -              char *name, *submit_name;
 +              char *name, *major_minor;
                double temperature;
                char *mode;
  
@@@ -497,11 -489,10 +499,11 @@@
                if (mode[0] == 'F')
                        temperature = (temperature - 32.0) * 5.0 / 9.0;
  
 -              if ((submit_name = hddtemp_get_name (name)) != NULL)
 +              if (translate_devicename
 +                              && (major_minor = hddtemp_get_major_minor (name)) != NULL)
                {
 -                      hddtemp_submit (submit_name, temperature);
 -                      free (submit_name);
 +                      hddtemp_submit (major_minor, temperature);
 +                      free (major_minor);
                }
                else
                {