diff options
author | Nalin Dahyabhai <nalin@redhat.com> | 2010-12-22 15:06:37 -0500 |
---|---|---|
committer | Nalin Dahyabhai <nalin@redhat.com> | 2010-12-22 15:06:37 -0500 |
commit | 9857ad8eb47677f831b5477d3242aad4a1bb8fe7 (patch) | |
tree | a4dc7689c6391ad9b6f408d75535ccd4f5223bb0 | |
parent | 25be5b3cc084e4ea2856da9165b8bd109fead620 (diff) | |
download | slapi-nis-9857ad8eb47677f831b5477d3242aad4a1bb8fe7.tar.gz slapi-nis-9857ad8eb47677f831b5477d3242aad4a1bb8fe7.tar.xz slapi-nis-9857ad8eb47677f831b5477d3242aad4a1bb8fe7.zip |
cast ber_len_t lengths to (int) when we use them to limit string lengths
in diagnostic messages
-rw-r--r-- | src/format.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/format.c b/src/format.c index 27114ef..ef6b3dd 100644 --- a/src/format.c +++ b/src/format.c @@ -1210,8 +1210,10 @@ format_deref_rx(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, state->plugin_desc->spd_id, "%s: found value " "\"%.*s\" in \"%s\"\n", - fname, bval->bv_len, - bval->bv_val, dn); + fname, + (int) bval->bv_len, + bval->bv_val, + dn); } } slapi_vattr_values_free(&values, &actual_attr, @@ -1397,7 +1399,7 @@ format_referred_entry_cb(Slapi_Entry *e, void *callback_data) slapi_log_error(SLAPI_LOG_PLUGIN, cbdata->state->plugin_desc->spd_id, "referred: got %d-byte value for \"%s\"\n", - val->bv_len, actual_attr); + (int) val->bv_len, actual_attr); /* Add it to the list of values we've retrieved. */ format_add_bv_list(&cbdata->choices, val); } @@ -1594,7 +1596,7 @@ format_referred_r_entry_cb(Slapi_Entry *e, void *cbdata_ptr) cbdata->state->plugin_desc->spd_id, "referred_r: found value " "\"%.*s\" in \"%s\"\n", - bval->bv_len, + (int) bval->bv_len, bval->bv_val, slapi_sdn_get_dn(sdn)); } @@ -2435,7 +2437,7 @@ format_collect(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, "collect: \"%.*s\"\n", - bv.bv_len, bv.bv_val); + (int) bv.bv_len, bv.bv_val); format_add_bv_list(&choices, &bv); } slapi_log_error(SLAPI_LOG_PLUGIN, @@ -2459,7 +2461,7 @@ format_collect(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, state->plugin_desc->spd_id, "collect: returning \"%.*s\" as a " "value for \"%s\"\n", - choices[i]->bv_len, + (int) choices[i]->bv_len, choices[i]->bv_val, slapi_entry_get_dn(e)); continue; @@ -2647,7 +2649,7 @@ format_link(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, slapi_log_error(SLAPI_LOG_PLUGIN, state->plugin_desc->spd_id, "link: \"%.*s\"\n", - bv.bv_len, bv.bv_val); + (int) bv.bv_len, bv.bv_val); format_add_bv_list(&choices, &bv); } } @@ -2872,9 +2874,9 @@ format_trim_value(struct plugin_state *state, struct berval input, state->plugin_desc->spd_id, "trim-ss: ->%.*s<- => " "->%.*s<-\n", - input.bv_len, + (int) input.bv_len, input.bv_val, - ret.bv_len, + (int) ret.bv_len, ret.bv_val); free(input.bv_val); return ret; @@ -2899,9 +2901,9 @@ format_trim_value(struct plugin_state *state, struct berval input, state->plugin_desc->spd_id, "trim-se: ->%.*s<- => " "->%.*s<-\n", - input.bv_len, + (int) input.bv_len, input.bv_val, - ret.bv_len, + (int) ret.bv_len, ret.bv_val); free(input.bv_val); return ret; @@ -2924,9 +2926,9 @@ format_trim_value(struct plugin_state *state, struct berval input, state->plugin_desc->spd_id, "trim-ls: ->%.*s<- => " "->%.*s<-\n", - input.bv_len, + (int) input.bv_len, input.bv_val, - ret.bv_len, + (int) ret.bv_len, ret.bv_val); free(input.bv_val); return ret; @@ -2949,9 +2951,9 @@ format_trim_value(struct plugin_state *state, struct berval input, state->plugin_desc->spd_id, "trim-le: ->%.*s<- => " "->%.*s<-\n", - input.bv_len, + (int) input.bv_len, input.bv_val, - ret.bv_len, + (int) ret.bv_len, ret.bv_val); free(input.bv_val); return ret; |