diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-01-23 22:36:42 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-01-23 22:36:42 +0000 |
| commit | d1c13e168660dfc384ead2efe29eb20a7abc5950 (patch) | |
| tree | af85fff369a6092b78c7e3c694784cd7207f1c1c /cups/snmp-private.h | |
| parent | d2354e63977f1d0386a8d5724db2ec90fb666824 (diff) | |
| download | cups-d1c13e168660dfc384ead2efe29eb20a7abc5950.tar.gz | |
Merge changes from CUPS 1.4svn-r8290.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1144 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/snmp-private.h')
| -rw-r--r-- | cups/snmp-private.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/cups/snmp-private.h b/cups/snmp-private.h index de6d0f6f3..1745b9259 100644 --- a/cups/snmp-private.h +++ b/cups/snmp-private.h @@ -6,7 +6,7 @@ * This API is PRIVATE and subject to change. No third-party applications * should use the SNMP API defined in this file. * - * Copyright 2007-2008 by Apple Inc. + * Copyright 2007-2009 by Apple Inc. * Copyright 2006-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -64,12 +64,12 @@ enum cups_asn1_e /**** ASN1 request/object types ****/ }; typedef enum cups_asn1_e cups_asn1_t; /**** ASN1 request/object types ****/ -struct cups_snmp_hexstring_s /**** Hex-STRING value ****/ +typedef struct cups_snmp_string_s /**** String value ****/ { unsigned char bytes[CUPS_SNMP_MAX_STRING]; /* Bytes in string */ int num_bytes; /* Number of bytes */ -}; +} cups_snmp_string_t; union cups_snmp_value_u /**** Object value ****/ { @@ -79,10 +79,7 @@ union cups_snmp_value_u /**** Object value ****/ unsigned gauge; /* Gauge value */ unsigned timeticks; /* Timeticks value */ int oid[CUPS_SNMP_MAX_OID]; /* OID value */ - char string[CUPS_SNMP_MAX_STRING]; - /* String value */ - struct cups_snmp_hexstring_s hex_string; - /* Hex string value */ + cups_snmp_string_t string; /* String value */ }; typedef struct cups_snmp_s /**** SNMP data packet ****/ |