diff options
| author | Pierre Grandin <grandinp@altern.org> | 2016-11-30 21:58:43 +0000 |
|---|---|---|
| committer | Pierre Grandin <grandinp@altern.org> | 2016-11-30 21:58:43 +0000 |
| commit | 5b879f94ebdc1232f73eac650b70270a2916ae2a (patch) | |
| tree | 1cc6265073e6695c7b6d1f4b4955427a13115854 /navit/vehicle/file | |
| parent | 589056c1b82569afd55312a15deda13f1c38d7da (diff) | |
| parent | 04f6fbdfe031fc19a22fbf0e5794d3e68f291f9d (diff) | |
| download | navit-5b879f94ebdc1232f73eac650b70270a2916ae2a.tar.gz | |
Merge remote-tracking branch 'origin/trunk' into CI_trusty
Conflicts:
ci/build_linux.sh
Diffstat (limited to 'navit/vehicle/file')
| -rw-r--r-- | navit/vehicle/file/vehicle_file.c | 8 | ||||
| -rw-r--r-- | navit/vehicle/file/vehicle_pipe.c | 2 | ||||
| -rw-r--r-- | navit/vehicle/file/vehicle_serial.c | 2 | ||||
| -rw-r--r-- | navit/vehicle/file/vehicle_socket.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/navit/vehicle/file/vehicle_file.c b/navit/vehicle/file/vehicle_file.c index f7a0024b9..bb6134042 100644 --- a/navit/vehicle/file/vehicle_file.c +++ b/navit/vehicle/file/vehicle_file.c @@ -1046,8 +1046,8 @@ vehicle_file_new_file(struct vehicle_methods void plugin_init(void) { dbg(lvl_debug, "vehicle_file:plugin_init:enter\n"); - plugin_register_vehicle_type("file", vehicle_file_new_file); - plugin_register_vehicle_type("pipe", vehicle_file_new_file); - plugin_register_vehicle_type("socket", vehicle_file_new_file); - plugin_register_vehicle_type("serial", vehicle_file_new_file); + plugin_register_category_vehicle("file", vehicle_file_new_file); + plugin_register_category_vehicle("pipe", vehicle_file_new_file); + plugin_register_category_vehicle("socket", vehicle_file_new_file); + plugin_register_category_vehicle("serial", vehicle_file_new_file); } diff --git a/navit/vehicle/file/vehicle_pipe.c b/navit/vehicle/file/vehicle_pipe.c index 0750edef3..420390d4e 100644 --- a/navit/vehicle/file/vehicle_pipe.c +++ b/navit/vehicle/file/vehicle_pipe.c @@ -23,5 +23,5 @@ void plugin_init(void) { - plugin_get_vehicle_type("file"); + plugin_get_category_vehicle("file"); } diff --git a/navit/vehicle/file/vehicle_serial.c b/navit/vehicle/file/vehicle_serial.c index 0750edef3..420390d4e 100644 --- a/navit/vehicle/file/vehicle_serial.c +++ b/navit/vehicle/file/vehicle_serial.c @@ -23,5 +23,5 @@ void plugin_init(void) { - plugin_get_vehicle_type("file"); + plugin_get_category_vehicle("file"); } diff --git a/navit/vehicle/file/vehicle_socket.c b/navit/vehicle/file/vehicle_socket.c index 0750edef3..420390d4e 100644 --- a/navit/vehicle/file/vehicle_socket.c +++ b/navit/vehicle/file/vehicle_socket.c @@ -23,5 +23,5 @@ void plugin_init(void) { - plugin_get_vehicle_type("file"); + plugin_get_category_vehicle("file"); } |