Changeset 0f75a63 in mainline for uspace/lib/conf/test/ini.c

Timestamp:

2020-07-05T21:01:49Z (4 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

6efe1b78

Parents:

0c01270

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-07-05 21:01:49)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

Conflicts:

boot/Makefile
uspace/app/sysctl/Makefile
uspace/app/sysctl/main.c
uspace/app/tester/proc/dummy_task.c
uspace/lib/c/generic/async/client.c
uspace/lib/c/generic/async/server.c
uspace/lib/c/generic/ns.c
uspace/lib/c/generic/private/async.h
uspace/lib/c/generic/private/taskman.h
uspace/lib/c/generic/task.c
uspace/lib/c/generic/task_event.c
uspace/lib/c/generic/taskman.c
uspace/lib/c/generic/taskman_noasync.c
uspace/lib/c/include/async.h
uspace/lib/c/include/task.h
uspace/lib/sysman/include/sysman/ctl.h
uspace/lib/sysman/src/ctl.c
uspace/lib/sysman/src/sysman.c
uspace/srv/devman/Makefile
uspace/srv/devman/driver.c
uspace/srv/devman/drv_conn.c
uspace/srv/hid/compositor/compositor.c
uspace/srv/loader/main.c
uspace/srv/locsrv/Makefile
uspace/srv/locsrv/locsrv.c
uspace/srv/ns/clonable.h
uspace/srv/sysman/Makefile
uspace/srv/sysman/connection_broker.c
uspace/srv/sysman/connection_broker.h
uspace/srv/sysman/connection_ctl.c
uspace/srv/sysman/connection_ctl.h
uspace/srv/sysman/edge.c
uspace/srv/sysman/job.c
uspace/srv/sysman/job.h
uspace/srv/sysman/job_closure.c
uspace/srv/sysman/log.h
uspace/srv/sysman/main.c
uspace/srv/sysman/repo.c
uspace/srv/sysman/sm_task.c
uspace/srv/sysman/sm_task.h
uspace/srv/sysman/sysman.c
uspace/srv/sysman/sysman.h
uspace/srv/sysman/test/job_closure.c
uspace/srv/sysman/units/unit_cfg.c
uspace/srv/sysman/units/unit_mnt.c
uspace/srv/sysman/units/unit_svc.c
uspace/srv/taskman/event.c
uspace/srv/taskman/event.h
uspace/srv/taskman/main.c
uspace/srv/taskman/task.c
uspace/srv/vfs/Makefile
uspace/srv/vfs/vfs.c
uspace/srv/vfs/vfs.h
uspace/srv/vfs/vfs_ops.c
uspace/srv/vfs/vfs_register.c

(No files)