comparison libfdproto/dictionary.c @ 1027:0117a7746b21

Fix a number of errors and warnings introduced/highlighted by recent commits
author Sebastien Decugis <sdecugis@freediameter.net>
date Mon, 15 Apr 2013 15:17:07 +0800
parents b90cb4c07160
children 4a2ac93e92ff
comparison
equal deleted inserted replaced
1026:beb375690453 1027:0117a7746b21
32 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * 32 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF *
33 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * 33 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
34 *********************************************************************************************************/ 34 *********************************************************************************************************/
35 35
36 #include "fdproto-internal.h" 36 #include "fdproto-internal.h"
37 #include <inttypes.h>
37 38
38 /* Names of the base types */ 39 /* Names of the base types */
39 const char * type_base_name[] = { /* must keep in sync with dict_avp_basetype */ 40 const char * type_base_name[] = { /* must keep in sync with dict_avp_basetype */
40 "GROUPED", /* AVP_TYPE_GROUPED */ 41 "GROUPED", /* AVP_TYPE_GROUPED */
41 "OCTETSTRING", /* AVP_TYPE_OCTETSTRING */ 42 "OCTETSTRING", /* AVP_TYPE_OCTETSTRING */
1176 { 1177 {
1177 int i, n=LEN_MAX; 1178 int i, n=LEN_MAX;
1178 if (enumval->enum_value.os.len < LEN_MAX) 1179 if (enumval->enum_value.os.len < LEN_MAX)
1179 n = enumval->enum_value.os.len; 1180 n = enumval->enum_value.os.len;
1180 for (i=0; i < n; i++) 1181 for (i=0; i < n; i++)
1181 fd_log_debug("0x%02.2X/'%c' ", enumval->enum_value.os.data[i], ASCII(enumval->enum_value.os.data[i])); 1182 fd_log_debug("0x%02hhX/'%c' ", enumval->enum_value.os.data[i], ASCII(enumval->enum_value.os.data[i]));
1182 if (n == LEN_MAX) 1183 if (n == LEN_MAX)
1183 fd_log_debug("..."); 1184 fd_log_debug("...");
1184 } 1185 }
1185 break; 1186 break;
1186 1187
1187 case AVP_TYPE_INTEGER32: 1188 case AVP_TYPE_INTEGER32:
1188 fd_log_debug("%i", enumval->enum_value.i32); 1189 fd_log_debug("%i", enumval->enum_value.i32);
1189 break; 1190 break;
1190 1191
1191 case AVP_TYPE_INTEGER64: 1192 case AVP_TYPE_INTEGER64:
1192 fd_log_debug("%lli", enumval->enum_value.i64); 1193 fd_log_debug(PRId64, enumval->enum_value.i64);
1193 break; 1194 break;
1194 1195
1195 case AVP_TYPE_UNSIGNED32: 1196 case AVP_TYPE_UNSIGNED32:
1196 fd_log_debug("%u", enumval->enum_value.u32); 1197 fd_log_debug("%u", enumval->enum_value.u32);
1197 break; 1198 break;
1198 1199
1199 case AVP_TYPE_UNSIGNED64: 1200 case AVP_TYPE_UNSIGNED64:
1200 fd_log_debug("%llu", enumval->enum_value.u64); 1201 fd_log_debug(PRIu64, enumval->enum_value.u64);
1201 break; 1202 break;
1202 1203
1203 case AVP_TYPE_FLOAT32: 1204 case AVP_TYPE_FLOAT32:
1204 fd_log_debug("%f", enumval->enum_value.f32); 1205 fd_log_debug("%f", enumval->enum_value.f32);
1205 break; 1206 break;
"Welcome to our mercurial repository"