The open source OpenXR runtime
aux/os/ble_dbus: Use printf padding.
authored by
Lubosz Sarnecki
and committed by
Jakob Bornecrantz
e350e42c
79dde59f
+14
-17
+14
-17
src/xrt/auxiliary/os/os_ble_dbus.c
+14
-17
src/xrt/auxiliary/os/os_ble_dbus.c
···
161
161
int type = dbus_message_iter_get_arg_type(element);
162
162
char *str;
163
163
164
-
for (int i = 0; i < level; i++) {
165
-
fprintf(stderr, " ");
166
-
}
167
-
168
164
switch (type) {
169
165
case DBUS_TYPE_INVALID: {
170
-
U_LOG_E("<>");
166
+
U_LOG_E("%*s<>", level, "");
171
167
return -1;
172
168
}
173
169
case DBUS_TYPE_BOOLEAN: {
174
170
int val;
175
171
dbus_message_iter_get_basic(element, &val);
176
-
U_LOG_D("BOOLEAN: %s", val == 0 ? "false" : "true");
172
+
U_LOG_D("%*sBOOLEAN: %s", level, "",
173
+
val == 0 ? "false" : "true");
177
174
return 0;
178
175
}
179
176
case DBUS_TYPE_BYTE: {
180
177
int8_t val;
181
178
dbus_message_iter_get_basic(element, &val);
182
-
U_LOG_D("BYTE: %02x", val);
179
+
U_LOG_D("%*sBYTE: %02x", level, "", val);
183
180
return 0;
184
181
}
185
182
case DBUS_TYPE_INT32: {
186
183
int32_t val;
187
184
dbus_message_iter_get_basic(element, &val);
188
-
U_LOG_D("INT32: %" PRIi32, val);
185
+
U_LOG_D("%*sINT32: %" PRIi32, level, "", val);
189
186
return 0;
190
187
}
191
188
case DBUS_TYPE_UINT32: {
192
189
uint32_t val;
193
190
dbus_message_iter_get_basic(element, &val);
194
-
U_LOG_D("UINT32: %" PRIu32, val);
191
+
U_LOG_D("%*sUINT32: %" PRIu32, level, "", val);
195
192
return 0;
196
193
}
197
194
case DBUS_TYPE_INT64: {
198
195
int64_t val;
199
196
dbus_message_iter_get_basic(element, &val);
200
-
U_LOG_D("INT64: %" PRIi64, val);
197
+
U_LOG_D("%*sINT64: %" PRIi64, level, "", val);
201
198
return 0;
202
199
}
203
200
case DBUS_TYPE_UINT64: {
204
201
uint64_t val;
205
202
dbus_message_iter_get_basic(element, &val);
206
-
U_LOG_D("UINT32: %" PRIu64, val);
203
+
U_LOG_D("%*sUINT32: %" PRIu64, level, "", val);
207
204
return 0;
208
205
}
209
206
case DBUS_TYPE_STRING: {
210
207
dbus_message_iter_get_basic(element, &str);
211
-
U_LOG_D("STRING: %s", str);
208
+
U_LOG_D("%*sSTRING: %s", level, "", str);
212
209
return 0;
213
210
}
214
211
case DBUS_TYPE_OBJECT_PATH: {
215
212
dbus_message_iter_get_basic(element, &str);
216
-
U_LOG_D("OBJECT_PATH: %s", str);
213
+
U_LOG_D("%*sOBJECT_PATH: %s", level, "", str);
217
214
return 0;
218
215
}
219
216
case DBUS_TYPE_ARRAY: {
220
217
int elm_type = dbus_message_iter_get_element_type(element);
221
218
int elm_count = dbus_message_iter_get_element_count(element);
222
-
U_LOG_D("ARRAY: %c:%i", elm_type, elm_count);
219
+
U_LOG_D("%*sARRAY: %c:%i", level, "", elm_type, elm_count);
223
220
DBusMessageIter sub;
224
221
dbus_message_iter_recurse(element, &sub);
225
222
dump_recurse(element, &sub, level + 2);
···
229
226
DBusMessageIter var;
230
227
dbus_message_iter_recurse(element, &var);
231
228
int var_type = dbus_message_iter_get_arg_type(&var);
232
-
U_LOG_D("VARIANT: %c", var_type);
229
+
U_LOG_D("%*sVARIANT: %c", level, "", var_type);
233
230
dump_one_element(&var, level + 2);
234
231
return 0;
235
232
}
236
233
case DBUS_TYPE_DICT_ENTRY: {
237
-
U_LOG_D("DICT");
234
+
U_LOG_D("%*sDICT", level, "");
238
235
DBusMessageIter sub;
239
236
dbus_message_iter_recurse(element, &sub);
240
237
dump_recurse(element, &sub, level + 2);
241
238
return 0;
242
239
}
243
240
default:
244
-
U_LOG_D("Got! %c", type); // line break
241
+
U_LOG_D("%*sGot! %c", level, "", type); // line break
245
242
return 0;
246
243
}
247
244
}