From 94d3f6b753d51e9c9715e1f75acbf04f5af593da Mon Sep 17 00:00:00 2001 From: Myungki Lee Date: Tue, 1 Nov 2016 16:05:55 +0900 Subject: [PATCH] Modify the license sentence - delete some extern sentence Change-Id: I384e0627ba5ab719d42deac6199abce0fd1173a5 Signed-off-by: Myungki Lee --- lib/include/shortcut.h | 8 ++++---- lib/include/shortcut_db.h | 20 ++++++++++++++++++-- lib/include/shortcut_error.h | 4 ++-- lib/include/shortcut_internal.h | 4 ++-- lib/include/shortcut_manager.h | 4 ++-- lib/include/shortcut_private.h | 4 ++-- lib/src/shortcut_db.c | 17 +++++++++++++++++ lib/src/shortcut_error.c | 2 +- lib/src/shortcut_internal.c | 2 +- lib/src/shortcut_manager.c | 4 ++-- pkgmgr_shortcut/include/dlist.h | 22 +++++++++++----------- pkgmgr_shortcut/src/dlist.c | 4 ++-- pkgmgr_shortcut/src/service_register.c | 4 ++-- test/application.c | 4 ++-- test/homescreen.c | 4 ++-- test/icon.c | 4 ++-- test/shortcut.c | 4 ++-- 17 files changed, 74 insertions(+), 41 deletions(-) diff --git a/lib/include/shortcut.h b/lib/include/shortcut.h index 5f66db1..8cd28a4 100755 --- a/lib/include/shortcut.h +++ b/lib/include/shortcut.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #ifndef __SHORTCUT_H__ #define __SHORTCUT_H__ @@ -103,8 +103,8 @@ GQuark shortcut_error_quark(void); #define ADD_TO_HOME_IS_DYNAMICBOX(type) (!!((type) & 0x10000000)) /* DEPRECATED API */ -extern int add_to_home_shortcut(const char *appid, const char *name, int type, const char *content_info, const char *icon, int allow_duplicate, result_internal_cb_t result_cb, void *data) __attribute__((deprecated)); -extern int add_to_home_dynamicbox(const char *appid, const char *name, int type, const char *content, const char *icon, double period, int allow_duplicate, result_internal_cb_t result_cb, void *data) __attribute__((deprecated)); +int add_to_home_shortcut(const char *appid, const char *name, int type, const char *content_info, const char *icon, int allow_duplicate, result_internal_cb_t result_cb, void *data) __attribute__((deprecated)); +int add_to_home_dynamicbox(const char *appid, const char *name, int type, const char *content, const char *icon, double period, int allow_duplicate, result_internal_cb_t result_cb, void *data) __attribute__((deprecated)); /** * @} diff --git a/lib/include/shortcut_db.h b/lib/include/shortcut_db.h index 4c51f7d..905b9f3 100644 --- a/lib/include/shortcut_db.h +++ b/lib/include/shortcut_db.h @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ #ifndef __SHORTCUT_DB_H__ #define __SHORTCUT_DB_H__ @@ -18,11 +34,11 @@ typedef struct shortcut_info { char *extra_data; } shortcut_info_s; -extern int shortcut_db_get_list(const char *package_name, GList **shortcut_list); +int shortcut_db_get_list(const char *package_name, GList **shortcut_list); #ifdef __cplusplus } #endif -#endif /* __SHORTCUT_DB_H__ */ \ No newline at end of file +#endif /* __SHORTCUT_DB_H__ */ diff --git a/lib/include/shortcut_error.h b/lib/include/shortcut_error.h index 185078d..f39d352 100755 --- a/lib/include/shortcut_error.h +++ b/lib/include/shortcut_error.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #ifndef __SHORTCUT_ERROR_H__ #define __SHORTCUT_ERROR_H__ diff --git a/lib/include/shortcut_internal.h b/lib/include/shortcut_internal.h index 923fe66..060e554 100755 --- a/lib/include/shortcut_internal.h +++ b/lib/include/shortcut_internal.h @@ -102,7 +102,7 @@ typedef int (*shortcut_remove_cb)(const char *package_name, const char *name, in * * @see shortcut_remove_cb */ -extern int shortcut_set_remove_cb(shortcut_remove_cb remove_cb, void *user_data); +int shortcut_set_remove_cb(shortcut_remove_cb remove_cb, void *user_data); /** * @internal @@ -161,7 +161,7 @@ extern int shortcut_set_remove_cb(shortcut_remove_cb remove_cb, void *user_data) * @endcode */ -extern int shortcut_remove_from_home(const char *name, result_cb_t result_cb, void *user_data); +int shortcut_remove_from_home(const char *name, result_cb_t result_cb, void *user_data); int _dbus_init(void); int _dbus_signal_init(); diff --git a/lib/include/shortcut_manager.h b/lib/include/shortcut_manager.h index 2ff256d..540a4be 100755 --- a/lib/include/shortcut_manager.h +++ b/lib/include/shortcut_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #ifndef __SHORTCUT_MANAGER_H__ #define __SHORTCUT_MANAGER_H__ diff --git a/lib/include/shortcut_private.h b/lib/include/shortcut_private.h index 2654d2c..b031c73 100755 --- a/lib/include/shortcut_private.h +++ b/lib/include/shortcut_private.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #if !defined(FLOG) #define DbgPrint(format, arg...) SECURE_LOGD(format, ##arg) diff --git a/lib/src/shortcut_db.c b/lib/src/shortcut_db.c index aacfd97..eb043f8 100755 --- a/lib/src/shortcut_db.c +++ b/lib/src/shortcut_db.c @@ -1,3 +1,20 @@ +/* + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + #include #include #include diff --git a/lib/src/shortcut_error.c b/lib/src/shortcut_error.c index 00c2b17..9d56e75 100755 --- a/lib/src/shortcut_error.c +++ b/lib/src/shortcut_error.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #include #include diff --git a/lib/src/shortcut_internal.c b/lib/src/shortcut_internal.c index 99c2b2a..26fb8f9 100755 --- a/lib/src/shortcut_internal.c +++ b/lib/src/shortcut_internal.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #include #include #include diff --git a/lib/src/shortcut_manager.c b/lib/src/shortcut_manager.c index 214707b..38be559 100755 --- a/lib/src/shortcut_manager.c +++ b/lib/src/shortcut_manager.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #include #include #include diff --git a/pkgmgr_shortcut/include/dlist.h b/pkgmgr_shortcut/include/dlist.h index c892923..18494be 100755 --- a/pkgmgr_shortcut/include/dlist.h +++ b/pkgmgr_shortcut/include/dlist.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #define dlist_remove_data(list, data) do { \ struct dlist *l; \ @@ -31,14 +31,14 @@ struct dlist; -extern struct dlist *dlist_append(struct dlist *list, void *data); -extern struct dlist *dlist_prepend(struct dlist *list, void *data); -extern struct dlist *dlist_remove(struct dlist *list, struct dlist *l); -extern struct dlist *dlist_find_data(struct dlist *list, void *data); -extern void *dlist_data(struct dlist *l); -extern struct dlist *dlist_next(struct dlist *l); -extern struct dlist *dlist_prev(struct dlist *l); -extern int dlist_count(struct dlist *l); -extern struct dlist *dlist_nth(struct dlist *l, int nth); +struct dlist *dlist_append(struct dlist *list, void *data); +struct dlist *dlist_prepend(struct dlist *list, void *data); +struct dlist *dlist_remove(struct dlist *list, struct dlist *l); +struct dlist *dlist_find_data(struct dlist *list, void *data); +void *dlist_data(struct dlist *l); +struct dlist *dlist_next(struct dlist *l); +struct dlist *dlist_prev(struct dlist *l); +int dlist_count(struct dlist *l); +struct dlist *dlist_nth(struct dlist *l, int nth); /* End of a file */ diff --git a/pkgmgr_shortcut/src/dlist.c b/pkgmgr_shortcut/src/dlist.c index 9cdf097..1540c3e 100755 --- a/pkgmgr_shortcut/src/dlist.c +++ b/pkgmgr_shortcut/src/dlist.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #include #include diff --git a/pkgmgr_shortcut/src/service_register.c b/pkgmgr_shortcut/src/service_register.c index cd0064e..a3db5c2 100755 --- a/pkgmgr_shortcut/src/service_register.c +++ b/pkgmgr_shortcut/src/service_register.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #include #include diff --git a/test/application.c b/test/application.c index 1d36ddb..9d5f9b5 100755 --- a/test/application.c +++ b/test/application.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #include #include diff --git a/test/homescreen.c b/test/homescreen.c index 05e5390..be4858b 100755 --- a/test/homescreen.c +++ b/test/homescreen.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #include #include diff --git a/test/icon.c b/test/icon.c index fc904c3..c5a8cb2 100755 --- a/test/icon.c +++ b/test/icon.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #include #include diff --git a/test/shortcut.c b/test/shortcut.c index 7c6bb6f..e849e5b 100755 --- a/test/shortcut.c +++ b/test/shortcut.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 - 2015 Samsung Electronics Co., Ltd. All rights reserved. + * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * -*/ + */ #include #include -- 2.7.4