Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix unused variable error in deployments (#2147)

Browse source 
* Fix unused variable error in deployments

* Remove Name: from files output
This commit is contained in:
Wesley Shillingford 2019-07-13 14:55:58 +01:00 • committed by GitHub
commit 3f1c2c3827
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
nano/lib/plat/linux/debugging.cpp
View file

@ -27,28 +27,34 @@ int create_load_memory_address_file (dl_phdr_info * info, size_t, void *)
0
#endif
);
// Write the name of shared library
::write (file_descriptor, "Name: ", 6);
::write (file_descriptor, info->dlpi_name, strlen (info->dlpi_name));
::write (file_descriptor, "\n", 1);
// Write the first load address found
for (auto i = 0; i < info->dlpi_phnum; ++i)
assert (file_descriptor);
if (file_descriptor)
{
if (info->dlpi_phdr[i].p_type == PT_LOAD)
// Write the name of shared library (can be empty for the executable)
auto name_length = strlen (info->dlpi_name);
if (name_length == 0 || (::write (file_descriptor, info->dlpi_name, name_length) > 0 && ::write (file_descriptor, "\n", 1) > 0))
{
auto load_address = info->dlpi_addr + info->dlpi_phdr[i].p_vaddr;
// Write the first load address found
for (auto i = 0; i < info->dlpi_phnum; ++i)
{
if (info->dlpi_phdr[i].p_type == PT_LOAD)
{
auto load_address = info->dlpi_addr + info->dlpi_phdr[i].p_vaddr;
// Each byte of the pointer is two hexadecimal characters, plus the 0x prefix and null terminator
char load_address_as_hex_str[sizeof (load_address) * 2 + 2 + 1];
snprintf (load_address_as_hex_str, sizeof (load_address_as_hex_str), "%p", (void *)load_address);
::write (file_descriptor, load_address_as_hex_str, strlen (load_address_as_hex_str));
break;
// Each byte of the pointer is two hexadecimal characters, plus the 0x prefix and null terminator
char load_address_as_hex_str[sizeof (load_address) * 2 + 2 + 1];
snprintf (load_address_as_hex_str, sizeof (load_address_as_hex_str), "%p", (void *)load_address);
if (::write (file_descriptor, load_address_as_hex_str, strlen (load_address_as_hex_str)) > 0)
{
// Intentionally empty to satisfy compiler that the return value of write is used
}
break;
}
}
}
}
::close (file_descriptor);
::close (file_descriptor);
}
++counter;
return 0;
}