------------------------------------------------------------ revno: 1439 committer: James Hunt <[email protected]> branch nick: upstart timestamp: Wed 2013-02-27 11:46:04 +0000 message: * Removal of gcc 'malloc' function attribute resulting from a clarification in its description which makes its use invalid. (LP: #1123588). modified: ChangeLog init/blocked.h init/conf.c init/conf.h init/environ.h init/event.h init/event_operator.h init/job.c init/job.h init/job_class.h init/job_process.h init/log.h init/parse_job.c init/parse_job.h init/process.h init/session.c init/session.h init/state.h init/tests/test_state.c init/xdg.h util/initctl.c util/tests/test_initctl.c
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'ChangeLog' --- ChangeLog 2013-02-26 16:31:52 +0000 +++ ChangeLog 2013-02-27 11:46:04 +0000 @@ -1,3 +1,9 @@ +2013-02-27 James Hunt <[email protected]> + + * Removal of gcc 'malloc' function attribute resulting from + a clarification in its description which makes its use invalid. + (LP: #1123588). + 2013-02-26 James Hunt <[email protected]> * util/tests/test_initctl.c: test_upstart_open(): Unset === modified file 'init/blocked.h' --- init/blocked.h 2012-07-30 14:07:37 +0000 +++ init/blocked.h 2013-02-27 11:46:04 +0000 @@ -77,7 +77,7 @@ NIH_BEGIN_EXTERN Blocked *blocked_new (const void *parent, BlockedType type, void *data) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); const char * blocked_type_enum_to_str (BlockedType type) === modified file 'init/conf.c' --- init/conf.c 2013-02-08 16:15:23 +0000 +++ init/conf.c 2013-02-27 11:46:04 +0000 @@ -84,15 +84,15 @@ __attribute__ ((warn_unused_result)); static inline char *toggle_conf_name (const void *parent, const char *path) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); static inline char * conf_to_job_name (const char *source_path, const char *conf_path) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); static char * conf_get_best_override (const char *name, const ConfSource *last_source) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); /** * conf_sources: === modified file 'init/conf.h' --- init/conf.h 2013-02-08 16:15:23 +0000 +++ init/conf.h 2013-02-27 11:46:04 +0000 @@ -116,9 +116,9 @@ ConfSource *conf_source_new (const void *parent, const char *path, ConfSourceType type) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); ConfFile * conf_file_new (ConfSource *source, const char *path) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); void conf_reload (void); int conf_source_reload (ConfSource *source) === modified file 'init/environ.h' --- init/environ.h 2013-01-08 15:57:31 +0000 +++ init/environ.h 2013-02-27 11:46:04 +0000 @@ -50,7 +50,7 @@ char * environ_expand (const void *parent, const char *string, char * const *env) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); NIH_END_EXTERN === modified file 'init/event.h' --- init/event.h 2012-09-20 13:07:53 +0000 +++ init/event.h 2013-02-27 11:46:04 +0000 @@ -89,8 +89,7 @@ void event_init (void); -Event *event_new (const void *parent, const char *name, char **env) - __attribute__ ((malloc)); +Event *event_new (const void *parent, const char *name, char **env); void event_block (Event *event); void event_unblock (Event *event); @@ -98,13 +97,13 @@ void event_poll (void); json_object *event_serialise (const Event *event) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); Event *event_deserialise (json_object *json) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); json_object * event_serialise_all (void) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); int event_deserialise_all (json_object *json) __attribute__ ((warn_unused_result)); === modified file 'init/event_operator.h' --- init/event_operator.h 2012-09-20 13:07:53 +0000 +++ init/event_operator.h 2013-02-27 11:46:04 +0000 @@ -78,10 +78,10 @@ EventOperator *event_operator_new (const void *parent, EventOperatorType type, const char *name, char **env) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); EventOperator *event_operator_copy (const void *parent, const EventOperator *old_oper) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); int event_operator_destroy (EventOperator *oper); @@ -109,7 +109,7 @@ void event_operator_reset (EventOperator *root); char *event_operator_collapse (EventOperator *condition) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); NIH_END_EXTERN === modified file 'init/job.c' --- init/job.c 2013-01-25 20:08:49 +0000 +++ init/job.c 2013-02-27 11:46:04 +0000 @@ -86,11 +86,11 @@ static json_object * job_serialise_kill_timer (NihTimer *timer) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); static NihTimer * job_deserialise_kill_timer (json_object *json) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); /** * job_new: === modified file 'init/job.h' --- init/job.h 2013-01-25 20:08:49 +0000 +++ init/job.h 2013-02-27 11:46:04 +0000 @@ -165,7 +165,7 @@ NIH_BEGIN_EXTERN Job * job_new (JobClass *class, const char *name) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); void job_register (Job *job, DBusConnection *conn, int signal); void job_change_goal (Job *job, JobGoal goal); @@ -176,8 +176,7 @@ void job_failed (Job *job, ProcessType process, int status); void job_finished (Job *job, int failed); -Event *job_emit_event (Job *job) - __attribute__ ((malloc)); +Event *job_emit_event (Job *job); const char *job_name (Job *job); @@ -215,7 +214,7 @@ Job *job_deserialise (JobClass *parent, json_object *json); json_object *job_serialise_all (const NihHash *jobs) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); int job_deserialise_all (JobClass *parent, json_object *json) __attribute__ ((warn_unused_result)); === modified file 'init/job_class.h' --- init/job_class.h 2013-02-08 16:15:23 +0000 +++ init/job_class.h 2013-02-27 11:46:04 +0000 @@ -237,7 +237,7 @@ int job_class_environment_unset (const char *name); char ** job_class_environment_get_all (const void *parent) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); const char *job_class_environment_get (const char *name) __attribute__ ((warn_unused_result)); @@ -245,7 +245,7 @@ JobClass * job_class_new (const void *parent, const char *name, Session *session) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); int job_class_consider (JobClass *class); int job_class_reconsider (JobClass *class); @@ -259,7 +259,7 @@ char **job_class_environment (const void *parent, JobClass *class, size_t *len) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); int job_class_get_instance (JobClass *class, @@ -340,13 +340,13 @@ __attribute__ ((warn_unused_result)); json_object *job_class_serialise (const JobClass *class) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); JobClass *job_class_deserialise (json_object *json) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); json_object * job_class_serialise_all (void) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); int job_class_deserialise_all (json_object *json) __attribute__ ((warn_unused_result)); === modified file 'init/job_process.h' --- init/job_process.h 2013-02-08 16:15:23 +0000 +++ init/job_process.h 2013-02-27 11:46:04 +0000 @@ -142,7 +142,7 @@ Job *job_process_find (pid_t pid, ProcessType *process); char *job_process_log_path (Job *job, int user_job) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); void job_process_set_kill_timer (Job *job, ProcessType process, === modified file 'init/log.h' --- init/log.h 2012-09-10 06:25:21 +0000 +++ init/log.h 2013-02-27 11:46:04 +0000 @@ -78,7 +78,7 @@ Log *log_new (const void *parent, const char *path, int fd, uid_t uid) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); void log_io_reader (Log *log, NihIo *io, const char *buf, size_t len); void log_io_error_handler (Log *log, NihIo *io); int log_destroy (Log *log) @@ -89,9 +89,9 @@ __attribute__ ((warn_unused_result)); void log_unflushed_init (void); json_object * log_serialise (Log *log) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); Log * log_deserialise (const void *parent, json_object *json) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); NIH_END_EXTERN === modified file 'init/parse_job.c' --- init/parse_job.c 2012-11-07 15:17:58 +0000 +++ init/parse_job.c 2013-02-27 11:46:04 +0000 @@ -67,7 +67,7 @@ NihConfigStanza *stanza, const char *file, size_t len, size_t *pos, size_t *lineno) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); static int parse_on_operator (JobClass *class, NihConfigStanza *stanza, const char *file, size_t len, === modified file 'init/parse_job.h' --- init/parse_job.h 2012-06-19 16:40:35 +0000 +++ init/parse_job.h 2013-02-27 11:46:04 +0000 @@ -33,12 +33,12 @@ JobClass *update, const char *name, const char *file, size_t len, size_t *pos, size_t *lineno) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); EventOperator * parse_on_simple (JobClass *class, const char *stanza_name, const char *string) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); NIH_END_EXTERN #endif /* INIT_PARSE_JOB_H */ === modified file 'init/process.h' --- init/process.h 2012-09-13 15:24:55 +0000 +++ init/process.h 2013-02-27 11:46:04 +0000 @@ -71,20 +71,20 @@ NIH_BEGIN_EXTERN Process * process_new (const void *parent) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); const char *process_name (ProcessType process) __attribute__ ((const)); json_object *process_serialise (const Process *process) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); Process *process_deserialise (json_object *json, const void *parent) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); json_object * process_serialise_all (const Process * const * const processes) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); ProcessType process_from_name (const char *process) __attribute__ ((warn_unused_result)); === modified file 'init/session.c' --- init/session.c 2013-02-08 16:15:23 +0000 +++ init/session.c 2013-02-27 11:46:04 +0000 @@ -51,10 +51,10 @@ /* Prototypes for static functions */ static json_object *session_serialise (const Session *session) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); static Session *session_deserialise (json_object *json) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); /** === modified file 'init/session.h' --- init/session.h 2013-02-08 16:15:23 +0000 +++ init/session.h 2013-02-27 11:46:04 +0000 @@ -81,12 +81,12 @@ void session_destroy (void); Session * session_new (const void *parent, const char *chroot) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); Session * session_from_dbus (const void *parent, NihDBusMessage *message); json_object * session_serialise_all (void) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); int session_deserialise_all (json_object *json) __attribute__ ((warn_unused_result)); === modified file 'init/state.h' --- init/state.h 2013-01-25 09:01:00 +0000 +++ init/state.h 2013-02-27 11:46:04 +0000 @@ -1158,11 +1158,11 @@ json_object * state_serialise_int32_array (int32_t *array, int count) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); json_object * state_serialise_int64_array (int64_t *array, int count) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); int _state_deserialise_str_array (void *parent, json_object *json, @@ -1181,7 +1181,7 @@ json_object * state_rlimit_serialise_all (struct rlimit * const *rlimits) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); int state_rlimit_deserialise_all (json_object *json, const void *parent, @@ -1189,7 +1189,7 @@ __attribute__ ((warn_unused_result)); char *state_collapse_env (const char **env) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); enum json_type state_get_json_type (const char *short_type) @@ -1201,7 +1201,7 @@ json_object * state_serialise_blocking (const NihList *blocking) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); int state_deserialise_blocking (void *parent, NihList *list, @@ -1221,10 +1221,10 @@ __attribute__ ((warn_unused_result)); json_object *state_rlimit_serialise (const struct rlimit *rlimit) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); struct rlimit *state_rlimit_deserialise (json_object *json) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); extern char **args_copy; extern int restart; === modified file 'init/tests/test_state.c' --- init/tests/test_state.c 2013-01-25 09:01:00 +0000 +++ init/tests/test_state.c 2013-02-27 11:46:04 +0000 @@ -60,11 +60,11 @@ */ json_object * state_serialise_blocked (const Blocked *blocked) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); Blocked * state_deserialise_blocked (void *parent, json_object *json, NihList *list) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); /** * AlreadySeen: === modified file 'init/xdg.h' --- init/xdg.h 2013-01-24 19:08:49 +0000 +++ init/xdg.h 2013-02-27 11:46:04 +0000 @@ -34,31 +34,31 @@ char * get_env_subdir (const char *envvar, const char *suffix, int create) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); char * get_home_subdir (const char * suffix, int create) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); char * xdg_get_config_home (void) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); char * xdg_get_cache_home (void) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); char * xdg_get_runtime_dir (void) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); char ** xdg_get_config_dirs (void) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); char ** get_user_upstart_dirs (void) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); char * get_user_log_dir (void) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); char * get_session_dir (void) - __attribute__ ((malloc, warn_unused_result)); + __attribute__ ((warn_unused_result)); NIH_END_EXTERN === modified file 'util/initctl.c' --- util/initctl.c 2013-02-14 17:24:05 +0000 +++ util/initctl.c 2013-02-27 11:46:04 +0000 @@ -64,13 +64,13 @@ /* Prototypes for local functions */ NihDBusProxy *upstart_open (const void *parent) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); char * job_status (const void *parent, NihDBusProxy *job_class, NihDBusProxy *job) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); char * job_usage (const void *parent, NihDBusProxy *job_class) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); /* Prototypes for static functions */ static void start_reply_handler (char **job_path, NihDBusMessage *message, === modified file 'util/tests/test_initctl.c' --- util/tests/test_initctl.c 2013-02-26 16:45:33 +0000 +++ util/tests/test_initctl.c 2013-02-27 11:46:04 +0000 @@ -938,10 +938,10 @@ extern int no_wait; extern NihDBusProxy *upstart_open (const void *parent) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); extern char * job_status (const void *parent, NihDBusProxy *job_class, NihDBusProxy *job) - __attribute__ ((warn_unused_result, malloc)); + __attribute__ ((warn_unused_result)); extern int start_action (NihCommand *command, char * const *args); extern int stop_action (NihCommand *command, char * const *args);
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
