License change: Apache License, Version 2.0.

[thirdparty/cups.git] / cups / snmp-private.h

diff --git a/cups/snmp-private.h b/cups/snmp-private.h
index 49f5b60fa64fc13e9232ebc52926cd1fe15c66c1..4c575c0f1c847c9e54fb076c088094067e7d8d77 100644 (file)
--- a/cups/snmp-private.h
+++ b/cups/snmp-private.h
@@ -1,18 +1,14 @@
 /*
- * "$Id$"
+ * Private SNMP definitions for CUPS.
  *
- *   Private SNMP definitions for CUPS.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 2006-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2012 by Apple Inc.
- *   Copyright 2006-2007 by Easy Software Products, all rights reserved.
- *
- *   These coded instructions, statements, and computer programs are the
- *   property of Apple Inc. and are protected by Federal copyright
- *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
- *   "LICENSE" which should have been included with this file.  If this
- *   file is missing or damaged, see the license at "http://www.cups.org/".
- *
- *   This file is subject to the Apple OS-Developed Software exception.
+ * These coded instructions, statements, and computer programs are the
+ * property of Apple Inc. and are protected by Federal copyright
+ * law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ * "LICENSE" which should have been included with this file.  If this
+ * file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 #ifndef _CUPS_SNMP_PRIVATE_H_
@@ -66,14 +62,14 @@ typedef struct cups_snmp_string_s   /**** String value ****/
 {
   unsigned char        bytes[CUPS_SNMP_MAX_STRING];
                                        /* Bytes in string */
-  int          num_bytes;              /* Number of bytes */
+  unsigned     num_bytes;              /* Number of bytes */
 } cups_snmp_string_t;
 
 union cups_snmp_value_u                        /**** Object value ****/
 {
   int          boolean;                /* Boolean value */
   int          integer;                /* Integer value */
-  unsigned     counter;                /* Counter value */
+  int          counter;                /* Counter value */
   unsigned     gauge;                  /* Gauge value */
   unsigned     timeticks;              /* Timeticks  value */
   int          oid[CUPS_SNMP_MAX_OID]; /* OID value */
@@ -88,7 +84,7 @@ typedef struct cups_snmp_s            /**** SNMP data packet ****/
   char         community[CUPS_SNMP_MAX_COMMUNITY];
                                        /* Community name */
   cups_asn1_t  request_type;           /* Request type */
-  int          request_id;             /* request-id value */
+  unsigned     request_id;             /* request-id value */
   int          error_status;           /* error-status value */
   int          error_index;            /* error-index value */
   int          object_name[CUPS_SNMP_MAX_OID];
@@ -139,8 +135,3 @@ extern int          _cupsSNMPWrite(int fd, http_addr_t *address, int version,
 }
 #  endif /* __cplusplus */
 #endif /* !_CUPS_SNMP_PRIVATE_H_ */
-
-
-/*
- * End of "$Id$".
- */