diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_adsiprog.c | 2 | ||||
| -rw-r--r-- | apps/app_festival.c | 2 | ||||
| -rw-r--r-- | apps/app_minivm.c | 2 | ||||
| -rw-r--r-- | apps/app_saycounted.c | 2 | ||||
| -rw-r--r-- | apps/app_skel.c | 4 | ||||
| -rw-r--r-- | apps/app_voicemail.c | 8 |
6 files changed, 11 insertions, 9 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 6d485d6fb..04aadb355 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -319,7 +319,7 @@ static int goto_line(char *buf, char *name, int id, char *args, struct adsi_scri else if (!strcasecmp(page, "COMM")) cmd = 0x80; else { - ast_log(LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got got '%s' at line %d of %s\n", page, lineno, script); + ast_log(LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got '%s' at line %d of %s\n", page, lineno, script); return 0; } diff --git a/apps/app_festival.c b/apps/app_festival.c index 3e2e020b8..715437e7e 100644 --- a/apps/app_festival.c +++ b/apps/app_festival.c @@ -403,6 +403,7 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) if (serverhost == NULL) { ast_log(LOG_WARNING, "festival_client: gethostbyname failed\n"); ast_config_destroy(cfg); + close(fd); return -1; } memmove(&serv_addr.sin_addr, serverhost->h_addr, serverhost->h_length); @@ -414,6 +415,7 @@ static int festival_exec(struct ast_channel *chan, const char *vdata) if (connect(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0) { ast_log(LOG_WARNING, "festival_client: connect to server failed\n"); ast_config_destroy(cfg); + close(fd); return -1; } diff --git a/apps/app_minivm.c b/apps/app_minivm.c index 8f920e09f..159584e0b 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -1352,7 +1352,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu prep_email_sub_vars(chan, vmu, cidnum, cidname, dur, date, counter); /* Find email address to use */ - /* If there's a server e-mail address in the account, use that, othterwise template */ + /* If there's a server e-mail address in the account, use that, otherwise template */ fromemail = ast_strlen_zero(vmu->serveremail) ? template->serveremail : vmu->serveremail; /* Find name to user for server e-mail */ diff --git a/apps/app_saycounted.c b/apps/app_saycounted.c index b44c1f6fe..195a50a06 100644 --- a/apps/app_saycounted.c +++ b/apps/app_saycounted.c @@ -39,7 +39,7 @@ <para>The number of things</para> </parameter> <parameter name="filename" required="true"> - <para>File name stem for the noun that is the the name of the things</para> + <para>File name stem for the noun that is the name of the things</para> </parameter> </syntax> <description> diff --git a/apps/app_skel.c b/apps/app_skel.c index 68f313fee..e85598a5f 100644 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -171,7 +171,7 @@ struct skel_level_state { }; /*! \brief Object to hold level config information. - * \note This object should hold a reference to an an object that holds state across reloads. + * \note This object should hold a reference to an object that holds state across reloads. * The other fields are just examples of the kind of data that might be stored in an level. */ struct skel_level { @@ -191,7 +191,7 @@ struct skel_level { * the running game. */ struct skel_current_game { - uint32_t total_games; /*! The total number of games for this call to to the app */ + uint32_t total_games; /*! The total number of games for this call to the app */ uint32_t games_left; /*! How many games are left to play in this set */ uint32_t cheat; /*! Whether or not cheating was enabled for the game */ struct skel_level *level_info; /*! The level information for the running game */ diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 1c54e2e97..e8b63a401 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1315,7 +1315,7 @@ static void populate_defaults(struct ast_vm_user *vmu) } /*! - * \brief Sets a a specific property value. + * \brief Sets a specific property value. * \param vmu The voicemail user object to work with. * \param var The name of the property to be set. * \param value The value to be set to the property. @@ -4753,7 +4753,7 @@ static void copy_plain_file(char *frompath, char *topath) /*! * \brief Removes the voicemail sound and information file. - * \param file The path to the sound file. This will be the the folder and message index, without the extension. + * \param file The path to the sound file. This will be the folder and message index, without the extension. * * This is used by the DELETE macro when voicemails are stored on the file system. * @@ -8175,7 +8175,7 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, * * When in the leave message mode (is_new_message == 1): * - allow the leaving of a message for ourselves. (Will not allow us to forward a message to ourselves, when is_new_message == 0). - * - attempt to determine the context and and mailbox, and then invoke leave_message() function to record and store the message. + * - attempt to determine the context and mailbox, and then invoke leave_message() function to record and store the message. * * When in the forward message mode (is_new_message == 0): * - retrieves the current message to be forwarded @@ -8276,7 +8276,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st old_exten = ast_strdupa(ast_channel_exten(chan)); old_priority = ast_channel_priority(chan); - /* call the the Directory, changes the channel */ + /* call the Directory, changes the channel */ snprintf(vmcontext, sizeof(vmcontext), "%s,,v", context ? context : "default"); res = pbx_exec(chan, directory_app, vmcontext); |