Merge changes from CUPS 1.6svn-r9939.

[thirdparty/cups.git] / backend / snmp-supplies.c

diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c
index 1bd8b7fa59ae1219f763d324f9ac48d26b506335..92febb60215416fa862d6c9f534907c1b639aebc 100644 (file)
--- a/backend/snmp-supplies.c
+++ b/backend/snmp-supplies.c
@@ -229,12 +229,12 @@ backendSNMPSupplies(
 
     for (i = 0, ptr = value; i < num_supplies; i ++, ptr += strlen(ptr))
     {
-      if (supplies[i].max_capacity > 0)
+      if (supplies[i].max_capacity > 0 && supplies[i].level >= 0)
        percent = 100 * supplies[i].level / supplies[i].max_capacity;
       else
         percent = 50;
 
-      if (percent <= 10)
+      if (percent <= 5)
       {
         switch (supplies[i].type)
         {
@@ -279,7 +279,7 @@ backendSNMPSupplies(
       if (i)
         *ptr++ = ',';
 
-      if (supplies[i].max_capacity > 0)
+      if (supplies[i].max_capacity > 0 && supplies[i].level >= 0)
         sprintf(ptr, "%d", percent);
       else
         strcpy(ptr, "-1");