Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de529e72 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolve merge conflicts of 7f5da850 to lmp-dev

Change-Id: I7a7547426a229ac99d187ec8bfabd49c4da51907
parents ad431d2e 7f5da850
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -99,10 +99,11 @@ out:
static void print_maps(struct pid_info_t* info)
{
    FILE *maps;

    size_t offset;
    char device[10];
    long int inode;
    char file[PATH_MAX];
    char file[1024];

    strlcat(info->path, "maps", sizeof(info->path));

@@ -110,8 +111,8 @@ static void print_maps(struct pid_info_t* info)
    if (!maps)
        goto out;

    while (fscanf(maps, "%*x-%*x %*s %zx %s %ld %s\n", &offset, device, &inode,
            file) == 4) {
    while (fscanf(maps, "%*x-%*x %*s %zx %5s %ld %1023s\n",
                  &offset, device, &inode, file) == 4) {
        // We don't care about non-file maps
        if (inode == 0 || !strcmp(device, "00:00"))
            continue;