i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sprintf -> snprintf. Also removed useless dprintf()

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28038 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2008-10-13 14:41:33 +00:00
parent 88b98cbc2c
commit b6e7f00598
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/acpi/acpi_ns_dump.c
+18 -21
View File
@@ -41,58 +41,59 @@ dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting)
for (i = 0; i < indenting; i++) { for (i = 0; i < indenting; i++) {
sprintf(tabs, "%s| ", tabs); sprintf(tabs, "%s| ", tabs);
} }
sprintf(tabs, "%s|--- ", tabs); snprintf(tabs, sizeof(tabs), "%s|--- ", tabs);
depth = sizeof(char) * 5 * indenting + sizeof(char); // index into result where the device name will be. depth = sizeof(char) * 5 * indenting + sizeof(char); // index into result where the device name will be.
//dprintf("acpi_ns_dump: recursing from %s, depth %d\n", root, depth); //dprintf("acpi_ns_dump: recursing from %s, depth %d\n", root, depth);
while (device->acpi->get_next_entry(ACPI_TYPE_ANY, root, result, 255, &counter) == B_OK) { while (device->acpi->get_next_entry(ACPI_TYPE_ANY, root, result, 255, &counter) == B_OK) {
type = device->acpi->get_object_type(result); type = device->acpi->get_object_type(result);
sprintf(output, "%s%s", tabs, result + depth); snprintf(output, sizeof(output), "%s%s", tabs, result + depth);
switch(type) { switch(type) {
case ACPI_TYPE_ANY: case ACPI_TYPE_ANY:
default:
break; break;
case ACPI_TYPE_INTEGER: case ACPI_TYPE_INTEGER:
sprintf(output, "%s INTEGER", output); snprintf(output, sizeof(output), "%s INTEGER", output);
break; break;
case ACPI_TYPE_STRING: case ACPI_TYPE_STRING:
sprintf(output, "%s STRING", output); snprintf(output, sizeof(output), "%s STRING", output);
break; break;
case ACPI_TYPE_BUFFER: case ACPI_TYPE_BUFFER:
sprintf(output, "%s BUFFER", output); snprintf(output, sizeof(output), "%s BUFFER", output);
break; break;
case ACPI_TYPE_PACKAGE: case ACPI_TYPE_PACKAGE:
sprintf(output, "%s PACKAGE", output); snprintf(output, sizeof(output), "%s PACKAGE", output);
break; break;
case ACPI_TYPE_FIELD_UNIT: case ACPI_TYPE_FIELD_UNIT:
sprintf(output, "%s FIELD UNIT", output); snprintf(output, sizeof(output), "%s FIELD UNIT", output);
break; break;
case ACPI_TYPE_DEVICE: case ACPI_TYPE_DEVICE:
device->acpi->get_device_hid(result, hid); device->acpi->get_device_hid(result, hid);
sprintf(output, "%s DEVICE (%s)", output, hid); snprintf(output, sizeof(output), "%s DEVICE (%s)", output, hid);
break; break;
case ACPI_TYPE_EVENT: case ACPI_TYPE_EVENT:
sprintf(output, "%s EVENT", output); snprintf(output, sizeof(output), "%s EVENT", output);
break; break;
case ACPI_TYPE_METHOD: case ACPI_TYPE_METHOD:
sprintf(output, "%s METHOD", output); snprintf(output, sizeof(output), "%s METHOD", output);
break; break;
case ACPI_TYPE_MUTEX: case ACPI_TYPE_MUTEX:
sprintf(output, "%s MUTEX", output); snprintf(output, sizeof(output), "%s MUTEX", output);
break; break;
case ACPI_TYPE_REGION: case ACPI_TYPE_REGION:
sprintf(output, "%s REGION", output); snprintf(output, sizeof(output), "%s REGION", output);
break; break;
case ACPI_TYPE_POWER: case ACPI_TYPE_POWER:
sprintf(output, "%s POWER", output); snprintf(output, sizeof(output), "%s POWER", output);
break; break;
case ACPI_TYPE_PROCESSOR: case ACPI_TYPE_PROCESSOR:
sprintf(output, "%s PROCESSOR", output); snprintf(output, sizeof(output), "%s PROCESSOR", output);
break; break;
case ACPI_TYPE_THERMAL: case ACPI_TYPE_THERMAL:
sprintf(output, "%s THERMAL", output); snprintf(output, sizeof(output), "%s THERMAL", output);
break; break;
case ACPI_TYPE_BUFFER_FIELD: case ACPI_TYPE_BUFFER_FIELD:
sprintf(output, "%s BUFFER_FIELD", output); snprintf(output, sizeof(output), "%s BUFFER_FIELD", output);
break; break;
} }
strcat(output, "\n"); strcat(output, "\n");
@@ -109,7 +110,6 @@ dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting)
dump_acpi_namespace(device, result, indenting + 1); dump_acpi_namespace(device, result, indenting + 1);
} }
// dprintf("dump_acpi_namespace() returns\n");
} }
@@ -170,7 +170,7 @@ acpi_namespace_read(void *_cookie, off_t position, void *buf, size_t* num_bytes)
size_t bytesRead = -1; size_t bytesRead = -1;
size_t bytesToRead = 0; size_t bytesToRead = 0;
status_t status; status_t status;
dprintf("acpi_namespace_read(cookie: %p, position: %ld, buffer: %p, size: %ld)\n", dprintf("acpi_namespace_read(cookie: %p, position: %lld, buffer: %p, size: %ld)\n",
_cookie, position, buf, *num_bytes); _cookie, position, buf, *num_bytes);
status = acquire_sem_etc(device->write_sem, 1, 0, 0); status = acquire_sem_etc(device->write_sem, 1, 0, 0);
@@ -182,16 +182,13 @@ acpi_namespace_read(void *_cookie, off_t position, void *buf, size_t* num_bytes)
} }
} }
dprintf("semaphore acquired: %s\n", strerror(status));
if (bytesRead < 0) { if (bytesRead < 0) {
*num_bytes = 0; *num_bytes = 0;
dprintf("returning %s\n", strerror(bytesRead));
return bytesRead; return bytesRead;
} }
*num_bytes = bytesRead; *num_bytes = bytesRead;
dprintf("%ld bytes read\n", bytesRead);
return B_OK; return B_OK;
} }