[Home]

Summary:ASTERISK-05942: [patch] more pbx.c cleanup
Reporter:Luigi Rizzo (rizzo)Labels:
Date Opened:2006-01-01 08:49:30.000-0600Date Closed:2008-01-15 16:10:19.000-0600
Priority:MajorRegression?No
Status:Closed/CompleteComponents:Core/General
Versions:Frequency of
Occurrence
Related
Issues:
Environment:Attachments:( 0) pbx2.diff
Description:+ a few more normalizations in the code that navigates
 various lists (functions, applications, acf);
+ replace a duplicated block of code with a for() loop
 in pbx_builtin_getvar_helper().
+ add a note that the 'complete' function on acf list is
 case-insensitive only for convenience.
Comments:By: Russell Bryant (russell) 2006-01-01 10:52:10.000-0600

Merged into the trunk with some modifications ...

doc/CODING-GUIDELINES has the following, so I had to add some braces to comply:

- No nested statements without braces, e.g.:

for (x = 0; x < 5; x++)
       if (foo)
               if (bar)
                       baz();

instead do:
for (x = 0; x < 5; x++) {
       if (foo) {
               if (bar)
                       baz();
       }
}  


Thanks!
By: Digium Subversion (svnbot) 2008-01-15 16:09:58.000-0600

Repository: asterisk
Revision: 7693

U   trunk/pbx.c

------------------------------------------------------------------------
r7693 | russell | 2008-01-15 16:09:58 -0600 (Tue, 15 Jan 2008) | 2 lines

clean up some loops and replace some duplicate code with a for loop (issue ASTERISK-5942)

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=7693
By: Digium Subversion (svnbot) 2008-01-15 16:10:16.000-0600

Repository: asterisk
Revision: 7711

_U  team/oej/multiparking/
U   team/oej/multiparking/apps/app_mixmonitor.c
U   team/oej/multiparking/channel.c
U   team/oej/multiparking/channels/chan_iax2.c
U   team/oej/multiparking/channels/chan_sip.c
U   team/oej/multiparking/include/asterisk/callerid.h
U   team/oej/multiparking/include/asterisk/channel.h
U   team/oej/multiparking/include/asterisk/doxyref.h
U   team/oej/multiparking/include/asterisk/options.h
U   team/oej/multiparking/pbx.c
U   team/oej/multiparking/say.c

------------------------------------------------------------------------
r7711 | oej | 2008-01-15 16:10:16 -0600 (Tue, 15 Jan 2008) | 44 lines

Merged revisions 7688,7690-7691,7693,7699,7705,7710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r7688 | russell | 2005-12-31 17:35:48 +0100 (Sat, 31 Dec 2005) | 2 lines

update comments to doxygen style

........
r7690 | russell | 2005-12-31 20:45:30 +0100 (Sat, 31 Dec 2005) | 3 lines

- fix some doxygen errors
- add the flag definitions to the page about global options

........
r7691 | russell | 2006-01-01 09:45:29 +0100 (Sun, 01 Jan 2006) | 3 lines

remove some duplicated code (issue ASTERISK-5940)
Also, touch up some formatting

........
r7693 | russell | 2006-01-01 18:50:37 +0100 (Sun, 01 Jan 2006) | 2 lines

clean up some loops and replace some duplicate code with a for loop (issue ASTERISK-5942)

........
r7699 | russell | 2006-01-01 19:37:50 +0100 (Sun, 01 Jan 2006) | 2 lines

fix a couple of doxygen errors

........
r7705 | bweschke | 2006-01-02 02:53:26 +0100 (Mon, 02 Jan 2006) | 3 lines

Fix compiler warnings.


........
r7710 | tilghman | 2006-01-02 08:41:02 +0100 (Mon, 02 Jan 2006) | 3 lines

Merged revisions 7709 via svnmerge from
/branches/1.2

........

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=7711
By: Digium Subversion (svnbot) 2008-01-15 16:10:19.000-0600

Repository: asterisk
Revision: 7712

_U  team/oej/aum-trunk/
U   team/oej/aum-trunk/acl.c
U   team/oej/aum-trunk/aescrypt.c
U   team/oej/aum-trunk/aeskey.c
U   team/oej/aum-trunk/alaw.c
U   team/oej/aum-trunk/app.c
U   team/oej/aum-trunk/apps/app_adsiprog.c
U   team/oej/aum-trunk/apps/app_authenticate.c
U   team/oej/aum-trunk/apps/app_cdr.c
U   team/oej/aum-trunk/apps/app_chanisavail.c
U   team/oej/aum-trunk/apps/app_chanspy.c
U   team/oej/aum-trunk/apps/app_controlplayback.c
U   team/oej/aum-trunk/apps/app_curl.c
U   team/oej/aum-trunk/apps/app_db.c
U   team/oej/aum-trunk/apps/app_dial.c
U   team/oej/aum-trunk/apps/app_dictate.c
U   team/oej/aum-trunk/apps/app_directed_pickup.c
U   team/oej/aum-trunk/apps/app_directory.c
U   team/oej/aum-trunk/apps/app_dumpchan.c
U   team/oej/aum-trunk/apps/app_echo.c
U   team/oej/aum-trunk/apps/app_externalivr.c
U   team/oej/aum-trunk/apps/app_festival.c
U   team/oej/aum-trunk/apps/app_flash.c
U   team/oej/aum-trunk/apps/app_forkcdr.c
U   team/oej/aum-trunk/apps/app_getcpeid.c
U   team/oej/aum-trunk/apps/app_hasnewvoicemail.c
U   team/oej/aum-trunk/apps/app_ices.c
U   team/oej/aum-trunk/apps/app_image.c
U   team/oej/aum-trunk/apps/app_intercom.c
U   team/oej/aum-trunk/apps/app_ivrdemo.c
U   team/oej/aum-trunk/apps/app_lookupblacklist.c
U   team/oej/aum-trunk/apps/app_lookupcidname.c
U   team/oej/aum-trunk/apps/app_macro.c
U   team/oej/aum-trunk/apps/app_meetme.c
U   team/oej/aum-trunk/apps/app_milliwatt.c
U   team/oej/aum-trunk/apps/app_mixmonitor.c
U   team/oej/aum-trunk/apps/app_mp3.c
U   team/oej/aum-trunk/apps/app_nbscat.c
U   team/oej/aum-trunk/apps/app_osplookup.c
U   team/oej/aum-trunk/apps/app_page.c
U   team/oej/aum-trunk/apps/app_parkandannounce.c
U   team/oej/aum-trunk/apps/app_playback.c
U   team/oej/aum-trunk/apps/app_privacy.c
U   team/oej/aum-trunk/apps/app_queue.c
U   team/oej/aum-trunk/apps/app_read.c
U   team/oej/aum-trunk/apps/app_readfile.c
U   team/oej/aum-trunk/apps/app_realtime.c
U   team/oej/aum-trunk/apps/app_record.c
U   team/oej/aum-trunk/apps/app_rpt.c
U   team/oej/aum-trunk/apps/app_sayunixtime.c
U   team/oej/aum-trunk/apps/app_senddtmf.c
U   team/oej/aum-trunk/apps/app_sendtext.c
U   team/oej/aum-trunk/apps/app_setcallerid.c
U   team/oej/aum-trunk/apps/app_setcdruserfield.c
U   team/oej/aum-trunk/apps/app_settransfercapability.c
U   team/oej/aum-trunk/apps/app_skel.c
U   team/oej/aum-trunk/apps/app_sms.c
U   team/oej/aum-trunk/apps/app_softhangup.c
U   team/oej/aum-trunk/apps/app_sql_postgres.c
U   team/oej/aum-trunk/apps/app_stack.c
U   team/oej/aum-trunk/apps/app_system.c
U   team/oej/aum-trunk/apps/app_talkdetect.c
U   team/oej/aum-trunk/apps/app_test.c
U   team/oej/aum-trunk/apps/app_transfer.c
U   team/oej/aum-trunk/apps/app_url.c
U   team/oej/aum-trunk/apps/app_verbose.c
U   team/oej/aum-trunk/apps/app_voicemail.c
U   team/oej/aum-trunk/apps/app_waitforring.c
U   team/oej/aum-trunk/apps/app_waitforsilence.c
U   team/oej/aum-trunk/apps/app_while.c
U   team/oej/aum-trunk/apps/app_zapateller.c
U   team/oej/aum-trunk/apps/app_zapbarge.c
U   team/oej/aum-trunk/apps/app_zapras.c
U   team/oej/aum-trunk/apps/app_zapscan.c
U   team/oej/aum-trunk/astmm.c
U   team/oej/aum-trunk/autoservice.c
U   team/oej/aum-trunk/buildinfo.c
U   team/oej/aum-trunk/callerid.c
U   team/oej/aum-trunk/cdr/cdr_csv.c
U   team/oej/aum-trunk/cdr/cdr_custom.c
U   team/oej/aum-trunk/cdr.c
U   team/oej/aum-trunk/channel.c
U   team/oej/aum-trunk/channels/chan_agent.c
U   team/oej/aum-trunk/channels/chan_alsa.c
U   team/oej/aum-trunk/channels/chan_features.c
U   team/oej/aum-trunk/channels/chan_h323.c
U   team/oej/aum-trunk/channels/chan_iax2.c
U   team/oej/aum-trunk/channels/chan_local.c
U   team/oej/aum-trunk/channels/chan_mgcp.c
U   team/oej/aum-trunk/channels/chan_modem.c
U   team/oej/aum-trunk/channels/chan_modem_aopen.c
U   team/oej/aum-trunk/channels/chan_modem_bestdata.c
U   team/oej/aum-trunk/channels/chan_modem_i4l.c
U   team/oej/aum-trunk/channels/chan_oss.c
U   team/oej/aum-trunk/channels/chan_phone.c
U   team/oej/aum-trunk/channels/chan_sip.c
U   team/oej/aum-trunk/channels/chan_zap.c
U   team/oej/aum-trunk/channels/iax2-parser.c
U   team/oej/aum-trunk/channels/iax2-provision.c
U   team/oej/aum-trunk/chanvars.c
U   team/oej/aum-trunk/cli.c
U   team/oej/aum-trunk/config.c
U   team/oej/aum-trunk/cryptostub.c
U   team/oej/aum-trunk/db.c
U   team/oej/aum-trunk/devicestate.c
U   team/oej/aum-trunk/dnsmgr.c
U   team/oej/aum-trunk/dsp.c
U   team/oej/aum-trunk/enum.c
U   team/oej/aum-trunk/file.c
U   team/oej/aum-trunk/frame.c
U   team/oej/aum-trunk/fskmodem.c
U   team/oej/aum-trunk/funcs/func_cdr.c
U   team/oej/aum-trunk/funcs/func_cut.c
U   team/oej/aum-trunk/funcs/func_db.c
U   team/oej/aum-trunk/funcs/func_enum.c
U   team/oej/aum-trunk/funcs/func_logic.c
U   team/oej/aum-trunk/funcs/func_math.c
U   team/oej/aum-trunk/funcs/func_md5.c
U   team/oej/aum-trunk/funcs/func_moh.c
U   team/oej/aum-trunk/funcs/func_odbc.c
U   team/oej/aum-trunk/funcs/func_strings.c
U   team/oej/aum-trunk/funcs/func_timeout.c
U   team/oej/aum-trunk/funcs/func_uri.c
U   team/oej/aum-trunk/funcs/pbx_functions.c
U   team/oej/aum-trunk/image.c
U   team/oej/aum-trunk/include/asterisk/callerid.h
U   team/oej/aum-trunk/include/asterisk/channel.h
U   team/oej/aum-trunk/include/asterisk/doxyref.h
U   team/oej/aum-trunk/include/asterisk/options.h
U   team/oej/aum-trunk/io.c
U   team/oej/aum-trunk/loader.c
U   team/oej/aum-trunk/logger.c
U   team/oej/aum-trunk/manager.c
U   team/oej/aum-trunk/muted.c
U   team/oej/aum-trunk/netsock.c
U   team/oej/aum-trunk/pbx.c
U   team/oej/aum-trunk/plc.c
U   team/oej/aum-trunk/privacy.c
U   team/oej/aum-trunk/res/res_adsi.c
U   team/oej/aum-trunk/res/res_agi.c
U   team/oej/aum-trunk/res/res_config_odbc.c
U   team/oej/aum-trunk/res/res_crypto.c
U   team/oej/aum-trunk/res/res_features.c
U   team/oej/aum-trunk/res/res_monitor.c
U   team/oej/aum-trunk/res/res_musiconhold.c
U   team/oej/aum-trunk/res/res_odbc.c
U   team/oej/aum-trunk/res/res_osp.c
U   team/oej/aum-trunk/rtp.c
U   team/oej/aum-trunk/say.c
U   team/oej/aum-trunk/sched.c
U   team/oej/aum-trunk/slinfactory.c
U   team/oej/aum-trunk/srv.c
U   team/oej/aum-trunk/tdd.c
U   team/oej/aum-trunk/term.c
U   team/oej/aum-trunk/translate.c
U   team/oej/aum-trunk/ulaw.c

------------------------------------------------------------------------
r7712 | oej | 2008-01-15 16:10:18 -0600 (Tue, 15 Jan 2008) | 55 lines

Merged revisions 7678,7682,7688,7690-7691,7693,7699,7705,7710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r7678 | tilghman | 2005-12-30 15:57:00 +0100 (Fri, 30 Dec 2005) | 3 lines

Merged revisions 7677 via svnmerge from
/branches/1.2

........
r7682 | russell | 2005-12-30 22:18:06 +0100 (Fri, 30 Dec 2005) | 2 lines

update doxygen docs to specify authors

........
r7688 | russell | 2005-12-31 17:35:48 +0100 (Sat, 31 Dec 2005) | 2 lines

update comments to doxygen style

........
r7690 | russell | 2005-12-31 20:45:30 +0100 (Sat, 31 Dec 2005) | 3 lines

- fix some doxygen errors
- add the flag definitions to the page about global options

........
r7691 | russell | 2006-01-01 09:45:29 +0100 (Sun, 01 Jan 2006) | 3 lines

remove some duplicated code (issue ASTERISK-5940)
Also, touch up some formatting

........
r7693 | russell | 2006-01-01 18:50:37 +0100 (Sun, 01 Jan 2006) | 2 lines

clean up some loops and replace some duplicate code with a for loop (issue ASTERISK-5942)

........
r7699 | russell | 2006-01-01 19:37:50 +0100 (Sun, 01 Jan 2006) | 2 lines

fix a couple of doxygen errors

........
r7705 | bweschke | 2006-01-02 02:53:26 +0100 (Mon, 02 Jan 2006) | 3 lines

Fix compiler warnings.


........
r7710 | tilghman | 2006-01-02 08:41:02 +0100 (Mon, 02 Jan 2006) | 3 lines

Merged revisions 7709 via svnmerge from
/branches/1.2

........

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=7712