diff --git a/swad_MFU.c b/swad_MFU.c index 0b7ce51c..4b84309b 100644 --- a/swad_MFU.c +++ b/swad_MFU.c @@ -55,7 +55,7 @@ #define MFU_MAX_BYTES_MENU ((MFU_MAX_CHARS_MENU + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 2047 /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -65,7 +65,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************** Private global variables *************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_QR.c b/swad_QR.c index 7a6993c1..79c90744 100644 --- a/swad_QR.c +++ b/swad_QR.c @@ -41,14 +41,14 @@ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal constants ****************************/ +/***************************** Private constants *****************************/ /*****************************************************************************/ #define QR_CODE_SIZE ((6 + 25 + 6) * 8) #define QR_DEFAULT_TYPE QR_ID /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -58,11 +58,11 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************** Private global variables *************************/ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_account.c b/swad_account.c index 09dc9e34..d5afb8e9 100644 --- a/swad_account.c +++ b/swad_account.c @@ -56,7 +56,7 @@ /*****************************************************************************/ /*****************************************************************************/ -/****************************** Internal types *******************************/ +/****************************** Private types ********************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -66,7 +66,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_action.c b/swad_action.c index a7f20be4..d4ef3550 100644 --- a/swad_action.c +++ b/swad_action.c @@ -86,7 +86,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************ Internal global variables **************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /* 1397 actions in one CGI: diff --git a/swad_announcement.c b/swad_announcement.c index e913419b..2aa72e2f 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -39,11 +39,11 @@ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal constants ****************************/ +/***************************** Private constants *****************************/ /*****************************************************************************/ /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -53,11 +53,11 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ static void Ann_PutIconToAddNewAnnouncement (void); diff --git a/swad_changelog.h b/swad_changelog.h index 13485a6f..88af4035 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -490,7 +490,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.76.1 (2019-11-21)" +#define Log_PLATFORM_VERSION "SWAD 19.76.2 (2019-11-21)" #define CSS_FILE "swad19.74.3.css" #define JS_FILE "swad19.70.js" /* @@ -498,6 +498,7 @@ ps2pdf source.ps destination.pdf // TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: En cada juego, poder listar los resultados en una tabla como la de resultados globales + Version 19.76.2: Nov 21, 2019 Code refactoring related to vectors. (246966 lines) Version 19.76.1: Nov 21, 2019 Code refactoring related to vectors. (247023 lines) Version 19.76: Nov 21, 2019 Code refactoring related to vectors. (247019 lines) Version 19.75.2: Nov 21, 2019 Fixed bug in enrolment. (247015 lines) diff --git a/swad_config.c b/swad_config.c index df8cbfbd..9d401319 100644 --- a/swad_config.c +++ b/swad_config.c @@ -40,11 +40,11 @@ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal constants ****************************/ +/***************************** Private constants *****************************/ /*****************************************************************************/ /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -54,11 +54,11 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************** Private global variables *************************/ /*****************************************************************************/ /*****************************************************************************/ -/**************************** Internal prototypes ****************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_connected.c b/swad_connected.c index 805ef829..9c7a4496 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -44,7 +44,7 @@ #include "swad_user.h" /*****************************************************************************/ -/*************************** Internal constants ******************************/ +/*************************** Private constants *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -54,7 +54,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/*************************** Internal prototypes *****************************/ +/**************************** Private prototypes *****************************/ /*****************************************************************************/ static void Con_PutIconToUpdateConnected (void); diff --git a/swad_cryptography.c b/swad_cryptography.c index 63c22d02..3fb88bae 100644 --- a/swad_cryptography.c +++ b/swad_cryptography.c @@ -39,11 +39,11 @@ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal constants ****************************/ +/***************************** Private constants *****************************/ /*****************************************************************************/ /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -54,7 +54,7 @@ extern struct Globals Gbl; extern const char Str_BIN_TO_BASE64URL[64 + 1]; /*****************************************************************************/ -/************************ Internal global variables **************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /***** SHA-256 algorithm *****/ @@ -68,7 +68,7 @@ extern const char Str_BIN_TO_BASE64URL[64 + 1]; #define BYTES_SHA512_ENCRYPTION (BITS_SHA512_ENCRYPTION/8) /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_database.c b/swad_database.c index 24b48310..3948b1a3 100644 --- a/swad_database.c +++ b/swad_database.c @@ -46,7 +46,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************ Internal global variables **************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_date.c b/swad_date.c index 0dca2807..eb8c2485 100644 --- a/swad_date.c +++ b/swad_date.c @@ -87,7 +87,7 @@ static const unsigned Dat_NumDaysMonth[1 + 12] = }; /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_duplicate.c b/swad_duplicate.c index 419aa42b..5b770a4e 100644 --- a/swad_duplicate.c +++ b/swad_duplicate.c @@ -47,7 +47,7 @@ /*****************************************************************************/ /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -57,7 +57,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************** Private global variables *************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_enrolment.c b/swad_enrolment.c index 68c20ac9..f9c5e335 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -71,7 +71,7 @@ static const bool Enr_ICanAdminOtherUsrs[Rol_NUM_ROLES] = }; /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ #define Enr_NUM_REG_REM_USRS_ACTIONS 6 @@ -105,7 +105,7 @@ typedef enum extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************** Private global variables *************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_figure.c b/swad_figure.c index e9ec9e46..58bd5203 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -83,7 +83,7 @@ struct Fig_FiguresForum }; /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/****************************** Private prototypes ***************************/ /*****************************************************************************/ static void Fig_PutParamsToShowFigure (void); diff --git a/swad_file_MIME.c b/swad_file_MIME.c index 697d94d5..b3658e94 100644 --- a/swad_file_MIME.c +++ b/swad_file_MIME.c @@ -31,7 +31,7 @@ #include "swad_file_MIME.h" /*****************************************************************************/ -/*************************** Internal constants ******************************/ +/*************************** Private constants *******************************/ /*****************************************************************************/ /* MIME types allowed for uploades files */ diff --git a/swad_file_browser.c b/swad_file_browser.c index b8a26b9a..0860af29 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -66,7 +66,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ typedef enum @@ -1256,11 +1256,11 @@ static const unsigned long long Brw_MAX_QUOTA_BRIEF[Rol_NUM_ROLES] = // MaxRole #define Brw_MAX_FOLDS_BRIEF 1000 /*****************************************************************************/ -/**************************** Internal variables *****************************/ +/***************************** Private variables *****************************/ /*****************************************************************************/ /*****************************************************************************/ -/*************************** Internal prototypes *****************************/ +/**************************** Private prototypes *****************************/ /*****************************************************************************/ static long Brw_GetGrpSettings (void); diff --git a/swad_file_extension.c b/swad_file_extension.c index f1e75be7..cc18af6e 100644 --- a/swad_file_extension.c +++ b/swad_file_extension.c @@ -29,7 +29,7 @@ #include "swad_string.h" /*****************************************************************************/ -/*************************** Internal constants ******************************/ +/*************************** Private constants *******************************/ /*****************************************************************************/ /* Extensions allowed for uploaded files */ diff --git a/swad_firewall.c b/swad_firewall.c index b47bf0e9..22c1a9f1 100644 --- a/swad_firewall.c +++ b/swad_firewall.c @@ -55,7 +55,7 @@ extern struct Globals Gbl; /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/****************************** Private prototypes ***************************/ /*****************************************************************************/ static void FW_BanIP (void); diff --git a/swad_follow.c b/swad_follow.c index 49c99231..9424e793 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -52,7 +52,7 @@ #define Fol_FOLLOW_SECTION_ID "follow_section" /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ typedef enum @@ -68,7 +68,7 @@ typedef enum extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_form.c b/swad_form.c index 392a2062..5c268dd4 100644 --- a/swad_form.c +++ b/swad_form.c @@ -40,7 +40,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************ Internal global variables **************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_game.c b/swad_game.c index 026e2c26..5e824d8d 100644 --- a/swad_game.c +++ b/swad_game.c @@ -56,14 +56,6 @@ extern struct Globals Gbl; #define Gam_MAX_CHARS_ANSWER (1024 - 1) // 1023 #define Gam_MAX_BYTES_ANSWER ((Gam_MAX_CHARS_ANSWER + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 16383 -// #define Gam_MAX_BYTES_LIST_ANSWER_TYPES (Gam_NUM_ANS_TYPES * (Cns_MAX_DECIMAL_DIGITS_UINT + 1)) - -const char *Gam_StrAnswerTypesDB[Gam_NUM_ANS_TYPES] = - { - "unique_choice", - "multiple_choice", - }; - #define Gam_MAX_ANSWERS_PER_QUESTION 10 #define Gam_MAX_SELECTED_QUESTIONS 1000 diff --git a/swad_group.c b/swad_group.c index fd6a5bb2..efa6834c 100644 --- a/swad_group.c +++ b/swad_group.c @@ -46,7 +46,7 @@ #include "swad_setting.h" /*****************************************************************************/ -/*************************** Internal constants ******************************/ +/*************************** Private constants *******************************/ /*****************************************************************************/ #define Grp_GROUP_TYPES_SECTION_ID "grp_types" @@ -69,7 +69,7 @@ static const bool Grp_ICanChangeGrps[Rol_NUM_ROLES] = }; /*****************************************************************************/ -/***************************** Internal types ********************************/ +/****************************** Private types ********************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -79,11 +79,11 @@ static const bool Grp_ICanChangeGrps[Rol_NUM_ROLES] = extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************** Private global variables *************************/ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ static void Grp_ReqEditGroupsInternal (Ale_AlertType_t AlertTypeGroupTypes,const char *AlertTextGroupTypes, diff --git a/swad_help.c b/swad_help.c index ac0ae2ab..5c6131fc 100644 --- a/swad_help.c +++ b/swad_help.c @@ -43,7 +43,7 @@ /*****************************************************************************/ /*****************************************************************************/ -/****************************** Internal types *******************************/ +/****************************** Private types ********************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -53,7 +53,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_icon.c b/swad_icon.c index 46479e33..fb48d025 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -45,21 +45,21 @@ extern struct Globals Gbl; /*****************************************************************************/ -/******************************** Private constants **************************/ +/******************************** Public constants ***************************/ /*****************************************************************************/ #define Ico_MAX_BYTES_ICON_SET_ID 16 const char *Ico_IconSetId[Ico_NUM_ICON_SETS] = { - "awesome", - "nuvola", + [Ico_ICON_SET_AWESOME] = "awesome", + [Ico_ICON_SET_NUVOLA ] = "nuvola", }; const char *Ico_IconSetNames[Ico_NUM_ICON_SETS] = { - "Awesome", - "Nuvola", + [Ico_ICON_SET_AWESOME] = "Awesome", + [Ico_ICON_SET_NUVOLA ] = "Nuvola", }; /*****************************************************************************/ diff --git a/swad_indicator.c b/swad_indicator.c index 3495f323..6d20b29f 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -48,11 +48,11 @@ extern struct Globals Gbl; /*****************************************************************************/ -/*************************** Internal constants ******************************/ +/**************************** Private constants ******************************/ /*****************************************************************************/ /*****************************************************************************/ -/******************************* Internal types ******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ typedef enum @@ -62,7 +62,7 @@ typedef enum } Ind_IndicatorsLayout_t; /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ static void Ind_GetParamsIndicators (void); diff --git a/swad_info.c b/swad_info.c index 465c5865..3508fa18 100644 --- a/swad_info.c +++ b/swad_info.c @@ -50,19 +50,19 @@ extern struct Globals Gbl; /*****************************************************************************/ -/*************************** Public constants ********************************/ +/****************************** Public constants *****************************/ /*****************************************************************************/ -const char *Inf_FileNamesForInfoType[Inf_NUM_INFO_TYPES] = +const Act_Action_t Inf_ActionsSeeInfo[Inf_NUM_INFO_TYPES] = { - Cfg_CRS_INFO_INTRODUCTION, - Cfg_CRS_INFO_TEACHING_GUIDE, - Cfg_CRS_INFO_LECTURES, - Cfg_CRS_INFO_PRACTICALS, - Cfg_CRS_INFO_BIBLIOGRAPHY, - Cfg_CRS_INFO_FAQ, - Cfg_CRS_INFO_LINKS, - Cfg_CRS_INFO_ASSESSMENT, + [Inf_INTRODUCTION ] = ActSeeCrsInf, + [Inf_TEACHING_GUIDE] = ActSeeTchGui, + [Inf_LECTURES ] = ActSeeSylLec, + [Inf_PRACTICALS ] = ActSeeSylPra, + [Inf_BIBLIOGRAPHY ] = ActSeeBib, + [Inf_FAQ ] = ActSeeFAQ, + [Inf_LINKS ] = ActSeeCrsLnk, + [Inf_ASSESSMENT ] = ActSeeAss, }; /*****************************************************************************/ @@ -73,210 +73,178 @@ const char *Inf_FileNamesForInfoType[Inf_NUM_INFO_TYPES] = /***************************** Private constants *****************************/ /*****************************************************************************/ +static const char *Inf_FileNamesForInfoType[Inf_NUM_INFO_TYPES] = + { + [Inf_INTRODUCTION ] = Cfg_CRS_INFO_INTRODUCTION, + [Inf_TEACHING_GUIDE] = Cfg_CRS_INFO_TEACHING_GUIDE, + [Inf_LECTURES ] = Cfg_CRS_INFO_LECTURES, + [Inf_PRACTICALS ] = Cfg_CRS_INFO_PRACTICALS, + [Inf_BIBLIOGRAPHY ] = Cfg_CRS_INFO_BIBLIOGRAPHY, + [Inf_FAQ ] = Cfg_CRS_INFO_FAQ, + [Inf_LINKS ] = Cfg_CRS_INFO_LINKS, + [Inf_ASSESSMENT ] = Cfg_CRS_INFO_ASSESSMENT, + }; + /* Functions to write forms in course edition (FAQ, links, etc.) */ -void (*Inf_FormsForEditionTypes[Inf_NUM_INFO_SOURCES])(Inf_InfoSrc_t InfoSrc) = +static void (*Inf_FormsForEditionTypes[Inf_NUM_INFO_SOURCES])(Inf_InfoSrc_t InfoSrc) = { - NULL, - Inf_FormToEnterIntegratedEditor, - Inf_FormToEnterPlainTextEditor, - Inf_FormToEnterRichTextEditor, - Inf_FormToSendPage, - Inf_FormToSendURL, + [Inf_INFO_SRC_NONE ] = NULL, + [Inf_INFO_SRC_EDITOR ] = Inf_FormToEnterIntegratedEditor, + [Inf_INFO_SRC_PLAIN_TEXT] = Inf_FormToEnterPlainTextEditor, + [Inf_INFO_SRC_RICH_TEXT ] = Inf_FormToEnterRichTextEditor, + [Inf_INFO_SRC_PAGE ] = Inf_FormToSendPage, + [Inf_INFO_SRC_URL ] = Inf_FormToSendURL, }; -const char *Inf_NamesInDBForInfoSrc[Inf_NUM_INFO_SOURCES] = +static const char *Inf_NamesInDBForInfoSrc[Inf_NUM_INFO_SOURCES] = { - "none", - "editor", - "plain_text", - "rich_text", - "page", - "URL", - }; -const Act_Action_t Inf_ActionsSeeInfo[Inf_NUM_INFO_TYPES] = - { - ActSeeCrsInf, - ActSeeTchGui, - ActSeeSylLec, - ActSeeSylPra, - ActSeeBib, - ActSeeFAQ, - ActSeeCrsLnk, - ActSeeAss, - }; -const Act_Action_t Inf_ActionsEditInfo[Inf_NUM_INFO_TYPES] = - { - ActEdiCrsInf, - ActEdiTchGui, - ActEdiSylLec, - ActEdiSylPra, - ActEdiBib, - ActEdiFAQ, - ActEdiCrsLnk, - ActEdiAss, - }; -const Act_Action_t Inf_ActionsChangeForceReadInfo[Inf_NUM_INFO_TYPES] = - { - ActChgFrcReaCrsInf, - ActChgFrcReaTchGui, - ActChgFrcReaSylLec, - ActChgFrcReaSylPra, - ActChgFrcReaBib, - ActChgFrcReaFAQ, - ActChgFrcReaCrsLnk, - ActChgFrcReaAss, - }; -const Act_Action_t Inf_ActionsIHaveReadInfo[Inf_NUM_INFO_TYPES] = - { - ActChgHavReaCrsInf, - ActChgHavReaTchGui, - ActChgHavReaSylLec, - ActChgHavReaSylPra, - ActChgHavReaBib, - ActChgHavReaFAQ, - ActChgHavReaCrsLnk, - ActChgHavReaAss, - }; -const Act_Action_t Inf_ActionsSelecInfoSrc[Inf_NUM_INFO_TYPES] = - { - ActSelInfSrcCrsInf, - ActSelInfSrcTchGui, - ActSelInfSrcSylLec, - ActSelInfSrcSylPra, - ActSelInfSrcBib, - ActSelInfSrcFAQ, - ActSelInfSrcCrsLnk, - ActSelInfSrcAss, - }; -const Act_Action_t Inf_ActionsInfo[Inf_NUM_INFO_SOURCES][Inf_NUM_INFO_TYPES] = - { - { - ActUnk, - ActUnk, - ActUnk, - ActUnk, - ActUnk, - ActUnk, - ActUnk, - ActUnk, - }, - { - ActEditorCrsInf, - ActEditorTchGui, - ActEditorSylLec, - ActEditorSylPra, - ActEditorBib, - ActEditorFAQ, - ActEditorCrsLnk, - ActEditorAss, - }, - { - ActPlaTxtEdiCrsInf, - ActPlaTxtEdiTchGui, - ActPlaTxtEdiSylLec, - ActPlaTxtEdiSylPra, - ActPlaTxtEdiBib, - ActPlaTxtEdiFAQ, - ActPlaTxtEdiCrsLnk, - ActPlaTxtEdiAss, - }, - { - ActRchTxtEdiCrsInf, - ActRchTxtEdiTchGui, - ActRchTxtEdiSylLec, - ActRchTxtEdiSylPra, - ActRchTxtEdiBib, - ActRchTxtEdiFAQ, - ActRchTxtEdiCrsLnk, - ActRchTxtEdiAss, - }, - { - ActRcvPagCrsInf, - ActRcvPagTchGui, - ActRcvPagSylLec, - ActRcvPagSylPra, - ActRcvPagBib, - ActRcvPagFAQ, - ActRcvPagCrsLnk, - ActRcvPagAss, - }, - { - ActRcvURLCrsInf, - ActRcvURLTchGui, - ActRcvURLSylLec, - ActRcvURLSylPra, - ActRcvURLBib, - ActRcvURLFAQ, - ActRcvURLCrsLnk, - ActRcvURLAss, - } + [Inf_INFO_SRC_NONE ] = "none", + [Inf_INFO_SRC_EDITOR ] = "editor", + [Inf_INFO_SRC_PLAIN_TEXT] = "plain_text", + [Inf_INFO_SRC_RICH_TEXT ] = "rich_text", + [Inf_INFO_SRC_PAGE ] = "page", + [Inf_INFO_SRC_URL ] = "URL", }; -const Act_Action_t Inf_ActionsEditorInfo[Inf_NUM_INFO_TYPES] = +static const Act_Action_t Inf_ActionsEditInfo[Inf_NUM_INFO_TYPES] = { - ActEditorCrsInf, - ActEditorTchGui, - ActEditorSylLec, - ActEditorSylPra, - ActEditorBib, - ActEditorFAQ, - ActEditorCrsLnk, - ActEditorAss, + [Inf_INTRODUCTION ] = ActEdiCrsInf, + [Inf_TEACHING_GUIDE] = ActEdiTchGui, + [Inf_LECTURES ] = ActEdiSylLec, + [Inf_PRACTICALS ] = ActEdiSylPra, + [Inf_BIBLIOGRAPHY ] = ActEdiBib, + [Inf_FAQ ] = ActEdiFAQ, + [Inf_LINKS ] = ActEdiCrsLnk, + [Inf_ASSESSMENT ] = ActEdiAss, }; -const Act_Action_t Inf_ActionsRcvPlaTxtInfo[Inf_NUM_INFO_TYPES] = + +static const Act_Action_t Inf_ActionsChangeForceReadInfo[Inf_NUM_INFO_TYPES] = { - ActRcvPlaTxtCrsInf, - ActRcvPlaTxtTchGui, - ActRcvPlaTxtSylLec, - ActRcvPlaTxtSylPra, - ActRcvPlaTxtBib, - ActRcvPlaTxtFAQ, - ActRcvPlaTxtCrsLnk, - ActRcvPlaTxtAss, + [Inf_INTRODUCTION ] = ActChgFrcReaCrsInf, + [Inf_TEACHING_GUIDE] = ActChgFrcReaTchGui, + [Inf_LECTURES ] = ActChgFrcReaSylLec, + [Inf_PRACTICALS ] = ActChgFrcReaSylPra, + [Inf_BIBLIOGRAPHY ] = ActChgFrcReaBib, + [Inf_FAQ ] = ActChgFrcReaFAQ, + [Inf_LINKS ] = ActChgFrcReaCrsLnk, + [Inf_ASSESSMENT ] = ActChgFrcReaAss, }; -const Act_Action_t Inf_ActionsRcvRchTxtInfo[Inf_NUM_INFO_TYPES] = + +static const Act_Action_t Inf_ActionsIHaveReadInfo[Inf_NUM_INFO_TYPES] = { - ActRcvRchTxtCrsInf, - ActRcvRchTxtTchGui, - ActRcvRchTxtSylLec, - ActRcvRchTxtSylPra, - ActRcvRchTxtBib, - ActRcvRchTxtFAQ, - ActRcvRchTxtCrsLnk, - ActRcvRchTxtAss, + [Inf_INTRODUCTION ] = ActChgHavReaCrsInf, + [Inf_TEACHING_GUIDE] = ActChgHavReaTchGui, + [Inf_LECTURES ] = ActChgHavReaSylLec, + [Inf_PRACTICALS ] = ActChgHavReaSylPra, + [Inf_BIBLIOGRAPHY ] = ActChgHavReaBib, + [Inf_FAQ ] = ActChgHavReaFAQ, + [Inf_LINKS ] = ActChgHavReaCrsLnk, + [Inf_ASSESSMENT ] = ActChgHavReaAss, }; -const Act_Action_t Inf_ActionsRcvPagBibEvEtc[Inf_NUM_INFO_TYPES] = + +static const Act_Action_t Inf_ActionsSelecInfoSrc[Inf_NUM_INFO_TYPES] = { - ActRcvPagCrsInf, - ActRcvPagTchGui, - ActRcvPagSylLec, - ActRcvPagSylPra, - ActRcvPagBib, - ActRcvPagFAQ, - ActRcvPagCrsLnk, - ActRcvPagAss, + [Inf_INTRODUCTION ] = ActSelInfSrcCrsInf, + [Inf_TEACHING_GUIDE] = ActSelInfSrcTchGui, + [Inf_LECTURES ] = ActSelInfSrcSylLec, + [Inf_PRACTICALS ] = ActSelInfSrcSylPra, + [Inf_BIBLIOGRAPHY ] = ActSelInfSrcBib, + [Inf_FAQ ] = ActSelInfSrcFAQ, + [Inf_LINKS ] = ActSelInfSrcCrsLnk, + [Inf_ASSESSMENT ] = ActSelInfSrcAss, }; -const Act_Action_t In_ActionsRcvURLBibEvEtc[Inf_NUM_INFO_TYPES] = + +static const Act_Action_t Inf_ActionsInfo[Inf_NUM_INFO_SOURCES][Inf_NUM_INFO_TYPES] = { - ActRcvURLCrsInf, - ActRcvURLTchGui, - ActRcvURLSylLec, - ActRcvURLSylPra, - ActRcvURLBib, - ActRcvURLFAQ, - ActRcvURLCrsLnk, - ActRcvURLAss, + [Inf_INFO_SRC_NONE ][Inf_INTRODUCTION ] = ActUnk, + [Inf_INFO_SRC_NONE ][Inf_TEACHING_GUIDE] = ActUnk, + [Inf_INFO_SRC_NONE ][Inf_LECTURES ] = ActUnk, + [Inf_INFO_SRC_NONE ][Inf_PRACTICALS ] = ActUnk, + [Inf_INFO_SRC_NONE ][Inf_BIBLIOGRAPHY ] = ActUnk, + [Inf_INFO_SRC_NONE ][Inf_FAQ ] = ActUnk, + [Inf_INFO_SRC_NONE ][Inf_LINKS ] = ActUnk, + [Inf_INFO_SRC_NONE ][Inf_ASSESSMENT ] = ActUnk, + + [Inf_INFO_SRC_EDITOR ][Inf_INTRODUCTION ] = ActEditorCrsInf, + [Inf_INFO_SRC_EDITOR ][Inf_TEACHING_GUIDE] = ActEditorTchGui, + [Inf_INFO_SRC_EDITOR ][Inf_LECTURES ] = ActEditorSylLec, + [Inf_INFO_SRC_EDITOR ][Inf_PRACTICALS ] = ActEditorSylPra, + [Inf_INFO_SRC_EDITOR ][Inf_BIBLIOGRAPHY ] = ActEditorBib, + [Inf_INFO_SRC_EDITOR ][Inf_FAQ ] = ActEditorFAQ, + [Inf_INFO_SRC_EDITOR ][Inf_LINKS ] = ActEditorCrsLnk, + [Inf_INFO_SRC_EDITOR ][Inf_ASSESSMENT ] = ActEditorAss, + + [Inf_INFO_SRC_PLAIN_TEXT][Inf_INTRODUCTION ] = ActPlaTxtEdiCrsInf, + [Inf_INFO_SRC_PLAIN_TEXT][Inf_TEACHING_GUIDE] = ActPlaTxtEdiTchGui, + [Inf_INFO_SRC_PLAIN_TEXT][Inf_LECTURES ] = ActPlaTxtEdiSylLec, + [Inf_INFO_SRC_PLAIN_TEXT][Inf_PRACTICALS ] = ActPlaTxtEdiSylPra, + [Inf_INFO_SRC_PLAIN_TEXT][Inf_BIBLIOGRAPHY ] = ActPlaTxtEdiBib, + [Inf_INFO_SRC_PLAIN_TEXT][Inf_FAQ ] = ActPlaTxtEdiFAQ, + [Inf_INFO_SRC_PLAIN_TEXT][Inf_LINKS ] = ActPlaTxtEdiCrsLnk, + [Inf_INFO_SRC_PLAIN_TEXT][Inf_ASSESSMENT ] = ActPlaTxtEdiAss, + + [Inf_INFO_SRC_RICH_TEXT ][Inf_INTRODUCTION ] = ActRchTxtEdiCrsInf, + [Inf_INFO_SRC_RICH_TEXT ][Inf_TEACHING_GUIDE] = ActRchTxtEdiTchGui, + [Inf_INFO_SRC_RICH_TEXT ][Inf_LECTURES ] = ActRchTxtEdiSylLec, + [Inf_INFO_SRC_RICH_TEXT ][Inf_PRACTICALS ] = ActRchTxtEdiSylPra, + [Inf_INFO_SRC_RICH_TEXT ][Inf_BIBLIOGRAPHY ] = ActRchTxtEdiBib, + [Inf_INFO_SRC_RICH_TEXT ][Inf_FAQ ] = ActRchTxtEdiFAQ, + [Inf_INFO_SRC_RICH_TEXT ][Inf_LINKS ] = ActRchTxtEdiCrsLnk, + [Inf_INFO_SRC_RICH_TEXT ][Inf_ASSESSMENT ] = ActRchTxtEdiAss, + + [Inf_INFO_SRC_PAGE ][Inf_INTRODUCTION ] = ActRcvPagCrsInf, + [Inf_INFO_SRC_PAGE ][Inf_TEACHING_GUIDE] = ActRcvPagTchGui, + [Inf_INFO_SRC_PAGE ][Inf_LECTURES ] = ActRcvPagSylLec, + [Inf_INFO_SRC_PAGE ][Inf_PRACTICALS ] = ActRcvPagSylPra, + [Inf_INFO_SRC_PAGE ][Inf_BIBLIOGRAPHY ] = ActRcvPagBib, + [Inf_INFO_SRC_PAGE ][Inf_FAQ ] = ActRcvPagFAQ, + [Inf_INFO_SRC_PAGE ][Inf_LINKS ] = ActRcvPagCrsLnk, + [Inf_INFO_SRC_PAGE ][Inf_ASSESSMENT ] = ActRcvPagAss, + + [Inf_INFO_SRC_URL ][Inf_INTRODUCTION ] = ActRcvURLCrsInf, + [Inf_INFO_SRC_URL ][Inf_TEACHING_GUIDE] = ActRcvURLTchGui, + [Inf_INFO_SRC_URL ][Inf_LECTURES ] = ActRcvURLSylLec, + [Inf_INFO_SRC_URL ][Inf_PRACTICALS ] = ActRcvURLSylPra, + [Inf_INFO_SRC_URL ][Inf_BIBLIOGRAPHY ] = ActRcvURLBib, + [Inf_INFO_SRC_URL ][Inf_FAQ ] = ActRcvURLFAQ, + [Inf_INFO_SRC_URL ][Inf_LINKS ] = ActRcvURLCrsLnk, + [Inf_INFO_SRC_URL ][Inf_ASSESSMENT ] = ActRcvURLAss, }; -const char *Inf_NamesInDBForInfoType[Inf_NUM_INFO_TYPES] = + +static const Act_Action_t Inf_ActionsRcvPlaTxtInfo[Inf_NUM_INFO_TYPES] = { - "intro", // TODO: Change this to "introduction"! - "description", // TODO: Change this to "guide"! - "theory", // TODO: Change this to "lectures"! - "practices", // TODO: Change this to "practicals"! - "bibliography", - "FAQ", - "links", - "assessment", + [Inf_INTRODUCTION ] = ActRcvPlaTxtCrsInf, + [Inf_TEACHING_GUIDE] = ActRcvPlaTxtTchGui, + [Inf_LECTURES ] = ActRcvPlaTxtSylLec, + [Inf_PRACTICALS ] = ActRcvPlaTxtSylPra, + [Inf_BIBLIOGRAPHY ] = ActRcvPlaTxtBib, + [Inf_FAQ ] = ActRcvPlaTxtFAQ, + [Inf_LINKS ] = ActRcvPlaTxtCrsLnk, + [Inf_ASSESSMENT ] = ActRcvPlaTxtAss, + }; + +static const Act_Action_t Inf_ActionsRcvRchTxtInfo[Inf_NUM_INFO_TYPES] = + { + [Inf_INTRODUCTION ] = ActRcvRchTxtCrsInf, + [Inf_TEACHING_GUIDE] = ActRcvRchTxtTchGui, + [Inf_LECTURES ] = ActRcvRchTxtSylLec, + [Inf_PRACTICALS ] = ActRcvRchTxtSylPra, + [Inf_BIBLIOGRAPHY ] = ActRcvRchTxtBib, + [Inf_FAQ ] = ActRcvRchTxtFAQ, + [Inf_LINKS ] = ActRcvRchTxtCrsLnk, + [Inf_ASSESSMENT ] = ActRcvRchTxtAss, + }; + +static const char *Inf_NamesInDBForInfoType[Inf_NUM_INFO_TYPES] = + { + [Inf_INTRODUCTION ] = "intro", // TODO: Change this to "introduction"! + [Inf_TEACHING_GUIDE] = "description", // TODO: Change this to "guide"! + [Inf_LECTURES ] = "theory", // TODO: Change this to "lectures"! + [Inf_PRACTICALS ] = "practices", // TODO: Change this to "practicals"! + [Inf_BIBLIOGRAPHY ] = "bibliography", + [Inf_FAQ ] = "FAQ", + [Inf_LINKS ] = "links", + [Inf_ASSESSMENT ] = "assessment", }; /***** Help *****/ diff --git a/swad_language.c b/swad_language.c index 585505ab..9ef0a61b 100644 --- a/swad_language.c +++ b/swad_language.c @@ -44,18 +44,18 @@ extern struct Globals Gbl; /*****************************************************************************/ const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES] = // ISO 639-1 language codes - { - "", // Lan_LANGUAGE_UNKNOWN - "ca", // Lan_LANGUAGE_CA - "de", // Lan_LANGUAGE_DE - "en", // Lan_LANGUAGE_EN - "es", // Lan_LANGUAGE_ES - "fr", // Lan_LANGUAGE_FR - "gn", // Lan_LANGUAGE_GN - "it", // Lan_LANGUAGE_IT - "pl", // Lan_LANGUAGE_PL - "pt", // Lan_LANGUAGE_PT - }; + { + [Lan_LANGUAGE_UNKNOWN] = "", + [Lan_LANGUAGE_CA ] = "ca", + [Lan_LANGUAGE_DE ] = "de", + [Lan_LANGUAGE_EN ] = "en", + [Lan_LANGUAGE_ES ] = "es", + [Lan_LANGUAGE_FR ] = "fr", + [Lan_LANGUAGE_GN ] = "gn", + [Lan_LANGUAGE_IT ] = "it", + [Lan_LANGUAGE_PL ] = "pl", + [Lan_LANGUAGE_PT ] = "pt", + }; /*****************************************************************************/ /****************************** Private constants ****************************/ diff --git a/swad_layout.c b/swad_layout.c index fe0afe7f..6c10e641 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -113,10 +113,10 @@ void Lay_WriteStartOfPage (void) extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES]; extern const unsigned Txt_Current_CGI_SWAD_Language; extern const char *The_TabOnBgColors[The_NUM_THEMES]; - const char *LayoutMainZone[Mnu_NUM_MENUS] = + static const char *LayoutMainZone[Mnu_NUM_MENUS] = { - "main_horizontal", // Mnu_MENU_HORIZONTAL - "main_vertical", // Mnu_MENU_VERTICAL + [Mnu_MENU_HORIZONTAL] = "main_horizontal", + [Mnu_MENU_VERTICAL ] = "main_vertical", }; Act_BrowserTab_t BrowserTab; @@ -880,23 +880,23 @@ static void Lay_WritePageTopHeading (void) extern const char *The_ClassTagline[The_NUM_THEMES]; extern const char *Txt_TAGLINE; extern const char *Txt_TAGLINE_BR; - const char *ClassHeadRow1[The_NUM_THEMES] = + static const char *ClassHeadRow1[The_NUM_THEMES] = { - "HEAD_ROW_1_WHITE", // The_THEME_WHITE - "HEAD_ROW_1_GREY", // The_THEME_GREY - "HEAD_ROW_1_PURPLE", // The_THEME_PURPLE - "HEAD_ROW_1_BLUE", // The_THEME_BLUE - "HEAD_ROW_1_YELLOW", // The_THEME_YELLOW - "HEAD_ROW_1_PINK", // The_THEME_PINK - }; - const char *ClassHeadRow2[The_NUM_THEMES] = + [The_THEME_WHITE ] = "HEAD_ROW_1_WHITE", + [The_THEME_GREY ] = "HEAD_ROW_1_GREY", + [The_THEME_PURPLE] = "HEAD_ROW_1_PURPLE", + [The_THEME_BLUE ] = "HEAD_ROW_1_BLUE", + [The_THEME_YELLOW] = "HEAD_ROW_1_YELLOW", + [The_THEME_PINK ] = "HEAD_ROW_1_PINK", + }; + static const char *ClassHeadRow2[The_NUM_THEMES] = { - "HEAD_ROW_2_WHITE", // The_THEME_WHITE - "HEAD_ROW_2_GREY", // The_THEME_GREY - "HEAD_ROW_2_PURPLE", // The_THEME_PURPLE - "HEAD_ROW_2_BLUE", // The_THEME_BLUE - "HEAD_ROW_2_YELLOW", // The_THEME_YELLOW - "HEAD_ROW_2_PINK", // The_THEME_PINK + [The_THEME_WHITE ] = "HEAD_ROW_2_WHITE", + [The_THEME_GREY ] = "HEAD_ROW_2_GREY", + [The_THEME_PURPLE] = "HEAD_ROW_2_PURPLE", + [The_THEME_BLUE ] = "HEAD_ROW_2_BLUE", + [The_THEME_YELLOW] = "HEAD_ROW_2_YELLOW", + [The_THEME_PINK ] = "HEAD_ROW_2_PINK", }; /***** Start header *****/ diff --git a/swad_logo.c b/swad_logo.c index dd8845ca..4cc60906 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -43,11 +43,11 @@ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal constants ****************************/ +/***************************** Private constants *****************************/ /*****************************************************************************/ /*****************************************************************************/ -/****************************** Internal types *******************************/ +/****************************** Private types ********************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -57,11 +57,11 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_main.c b/swad_main.c index d84a2ba4..60cdebba 100644 --- a/swad_main.c +++ b/swad_main.c @@ -55,11 +55,11 @@ extern struct Globals Gbl; /*****************************************************************************/ -/******************************* Internal types ******************************/ +/******************************** Private types ******************************/ /*****************************************************************************/ /*****************************************************************************/ -/************************ Internal global variables **************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_mark.c b/swad_mark.c index f9f020dc..305cb23e 100644 --- a/swad_mark.c +++ b/swad_mark.c @@ -51,7 +51,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ typedef enum @@ -61,19 +61,19 @@ typedef enum } Brw_HeadOrFoot_t; /*****************************************************************************/ -/**************************** Internal constants *****************************/ +/***************************** Private constants *****************************/ /*****************************************************************************/ -const char *Mrk_HeadOrFootStr[2] = // Names of columns in database, so don't change! - { - "Header", - "Footer", - }; +static const char *Mrk_HeadOrFootStr[2] = // Names of columns in database, so don't change! + { + "Header", + "Footer", + }; #define Mrk_MAX_BYTES_IN_CELL_CONTENT 1024 // Cell of a table containing one or several user's IDs /*****************************************************************************/ -/*************************** Internal prototypes *****************************/ +/**************************** Private prototypes *****************************/ /*****************************************************************************/ static void Mrk_GetNumRowsHeaderAndFooter (struct MarksProperties *Marks); diff --git a/swad_media.c b/swad_media.c index d2830503..924f8118 100644 --- a/swad_media.c +++ b/swad_media.c @@ -52,38 +52,38 @@ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal constants ****************************/ +/***************************** Private constants *****************************/ /*****************************************************************************/ -const char *Med_StringsTypeDB[Med_NUM_TYPES] = +static const char *Med_StringsTypeDB[Med_NUM_TYPES] = { - "none", // Med_NONE - "jpg", // Med_JPG - "gif", // Med_GIF - "mp4", // Med_MP4 - "webm", // Med_WEBM - "ogg", // Med_OGG - "youtube", // Med_YOUTUBE - "embed", // Med_EMBED - }; + [Med_TYPE_NONE] = "none", + [Med_JPG ] = "jpg", + [Med_GIF ] = "gif", + [Med_MP4 ] = "mp4", + [Med_WEBM ] = "webm", + [Med_OGG ] = "ogg", + [Med_YOUTUBE ] = "youtube", + [Med_EMBED ] = "embed", + }; -const char *Med_Extensions[Med_NUM_TYPES] = +static const char *Med_Extensions[Med_NUM_TYPES] = { - "", // Med_NONE - "jpg", // Med_JPG - "gif", // Med_GIF - "mp4", // Med_MP4 - "webm", // Med_WEBM - "ogg", // Med_OGG - "", // Med_YOUTUBE - "", // Med_EMBED + [Med_TYPE_NONE] = "", + [Med_JPG ] = "jpg", + [Med_GIF ] = "gif", + [Med_MP4 ] = "mp4", + [Med_WEBM ] = "webm", + [Med_OGG ] = "ogg", + [Med_YOUTUBE ] = "", + [Med_EMBED ] = "", }; #define Med_MAX_SIZE_GIF (5UL * 1024UL * 1024UL) // 5 MiB #define Med_MAX_SIZE_MP4 (5UL * 1024UL * 1024UL) // 5 MiB /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ #define Med_NUM_FORM_TYPES 4 @@ -113,11 +113,11 @@ struct MediaUploader extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************** Private global variables *************************/ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ static void Med_ResetMediaExceptURLAndTitle (struct Media *Media); diff --git a/swad_menu.c b/swad_menu.c index 968a311f..f533f754 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -44,32 +44,24 @@ extern struct Globals Gbl; +/*****************************************************************************/ +/******************************* Public constants ****************************/ +/*****************************************************************************/ + +const char *Mnu_MenuIcons[Mnu_NUM_MENUS] = + { + [Mnu_MENU_HORIZONTAL] = "ellipsis-h.svg", + [Mnu_MENU_VERTICAL ] = "ellipsis-v.svg", + }; + /*****************************************************************************/ /****************************** Private constants ****************************/ /*****************************************************************************/ #define MAX_MENU_ID 16 -const char *Mnu_MenuId[Mnu_NUM_MENUS] = - { - "horizontal", - "vertical", - }; - -const char *Mnu_MenuNames[Mnu_NUM_MENUS] = - { - "Horizontal", - "Vertical", - }; - -const char *Mnu_MenuIcons[Mnu_NUM_MENUS] = - { - "ellipsis-h.svg", - "ellipsis-v.svg", - }; - // Actions not initialized are 0 by default -const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = +static const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = { // TabUnk ******************* { diff --git a/swad_message.c b/swad_message.c index 78ed402e..bd70d9a9 100644 --- a/swad_message.c +++ b/swad_message.c @@ -82,7 +82,7 @@ static const Pag_WhatPaginate_t Msg_WhatPaginate[Msg_NUM_TYPES_OF_MSGS] = /*****************************************************************************/ /*****************************************************************************/ -/**************************** Internal prototypes ****************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]); diff --git a/swad_profile.c b/swad_profile.c index d03b193b..e6b654fb 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -58,7 +58,7 @@ /*****************************************************************************/ /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -68,7 +68,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_report.c b/swad_report.c index 03702f2f..ccb65655 100644 --- a/swad_report.c +++ b/swad_report.c @@ -60,7 +60,7 @@ #define Rep_BLOCK "-" /*****************************************************************************/ -/****************************** Internal types *******************************/ +/****************************** Private types ********************************/ /*****************************************************************************/ struct Rep_CurrentTimeUTC @@ -98,7 +98,7 @@ struct Rep_Report extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_role.c b/swad_role.c index cb5f70c3..3ae0e4c2 100644 --- a/swad_role.c +++ b/swad_role.c @@ -57,7 +57,7 @@ const char *Rol_Icons[Rol_NUM_ROLES] = /*****************************************************************************/ /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -67,7 +67,7 @@ const char *Rol_Icons[Rol_NUM_ROLES] = extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_scope.c b/swad_scope.c index 76d5387f..7ec40482 100644 --- a/swad_scope.c +++ b/swad_scope.c @@ -38,11 +38,11 @@ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal constants ****************************/ +/***************************** Private constants *****************************/ /*****************************************************************************/ /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -52,11 +52,11 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_search.c b/swad_search.c index 6fb4b2ca..00f35e22 100644 --- a/swad_search.c +++ b/swad_search.c @@ -41,14 +41,14 @@ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal constants ****************************/ +/****************************** Private constants ****************************/ /*****************************************************************************/ #define Sch_MIN_LENGTH_LONGEST_WORD 3 #define Sch_MIN_LENGTH_TOTAL 3 // "A An" is not valid; "A An Ann" is valid /*****************************************************************************/ -/****************************** Internal types *******************************/ +/****************************** Private types ********************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -58,11 +58,11 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie_Level_t DefaultScope); diff --git a/swad_session.c b/swad_session.c index e1402816..0e1aaa65 100644 --- a/swad_session.c +++ b/swad_session.c @@ -38,7 +38,7 @@ #include "swad_timeline.h" /*****************************************************************************/ -/**************************** Internal constants *****************************/ +/***************************** Private constants *****************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -48,7 +48,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ static void Ses_RemoveSessionFromDB (void); diff --git a/swad_statistic.c b/swad_statistic.c index e4693d5c..a169512f 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -98,7 +98,7 @@ typedef enum } Sta_GlobalOrCourseAccesses_t; /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ static void Sta_PutLinkToCourseHits (void); diff --git a/swad_string.c b/swad_string.c index 2e75805b..c7aa1a9f 100644 --- a/swad_string.c +++ b/swad_string.c @@ -47,11 +47,11 @@ extern struct Globals Gbl; // Declaration in swad.c /*****************************************************************************/ -/****************************** Internal types *******************************/ +/****************************** Private types ********************************/ /*****************************************************************************/ /*****************************************************************************/ -/*************************** Internal prototypes *****************************/ +/*************************** Private prototypes ******************************/ /*****************************************************************************/ static unsigned Str_GetNextASCIICharFromStr (const char *Ptr,unsigned char *Ch); @@ -63,7 +63,7 @@ static int Str_ReadCharAndSkipCommentsWriting (FILE *FileSrc,FILE *FileTgt,Str_S static int Str_ReadCharAndSkipCommentsBackward (FILE *FileSrc,Str_SkipHTMLComments_t SkipHTMLComments); /*****************************************************************************/ -/**************************** Internal constants *****************************/ +/**************************** Private constants ******************************/ /*****************************************************************************/ /***** Conversion to Base64URL *****/ @@ -79,7 +79,7 @@ static const char Str_LF[2] = {10,0}; static const char Str_CR[2] = {13,0}; /*****************************************************************************/ -/****************************** Internal types *******************************/ +/****************************** Private types ********************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_test.c b/swad_test.c index 7a2515c3..a695e835 100644 --- a/swad_test.c +++ b/swad_test.c @@ -122,7 +122,7 @@ const char *Tst_StrAnswerTypesDB[Tst_NUM_ANS_TYPES] = #define Tst_IMAGE_SAVED_QUALITY 75 // 1 to 100 /*****************************************************************************/ -/******************************* Internal types ******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ #define Tst_NUM_STATUS 2 @@ -140,11 +140,11 @@ typedef enum extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ static void Tst_PutFormToViewTstResults (Act_Action_t Action); diff --git a/swad_test_import.c b/swad_test_import.c index 7d51584d..dd9a68b1 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -48,7 +48,7 @@ /*****************************************************************************/ /*****************************************************************************/ -/******************************* Internal types ******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -58,11 +58,11 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ static void TsI_PutParamsExportQsts (void); diff --git a/swad_timeline.c b/swad_timeline.c index 07b964eb..a211b29c 100644 --- a/swad_timeline.c +++ b/swad_timeline.c @@ -97,7 +97,7 @@ typedef enum // in timeline posts, the quality should not be high in order to speed up the loading of images /*****************************************************************************/ -/****************************** Internal types *******************************/ +/****************************** Private types ********************************/ /*****************************************************************************/ struct TL_Note @@ -137,7 +137,7 @@ typedef enum extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_timetable.c b/swad_timetable.c index da8d91b0..65f89a0d 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -53,7 +53,7 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************ Internal constants and types ***********************/ +/************************* Private constants and types ***********************/ /*****************************************************************************/ #define TT_DAYS_PER_WEEK 7 // Seven days per week @@ -121,7 +121,7 @@ unsigned TT_MinutesPerInterval[TT_NUM_RESOLUTIONS] = }; /*****************************************************************************/ -/***************************** Internal prototypes **************************/ +/***************************** Private prototypes ***************************/ /*****************************************************************************/ static void TT_TimeTableConfigureIntervalsAndAllocateTimeTable (void); diff --git a/swad_user.c b/swad_user.c index 883dbad2..c58cbc88 100644 --- a/swad_user.c +++ b/swad_user.c @@ -142,7 +142,7 @@ const char *Usr_UsrDatMainFieldNames[Usr_NUM_MAIN_FIELDS_DATA_USR]; #define Usr_MAX_BYTES_QUERY_GET_LIST_USRS (16 * 1024 - 1) /*****************************************************************************/ -/****************************** Internal types *******************************/ +/****************************** Private types ********************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/swad_zip.c b/swad_zip.c index 660bf017..793741c0 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -50,14 +50,14 @@ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal constants ****************************/ +/***************************** Private constants *****************************/ /*****************************************************************************/ #define ZIP_MiB (1024ULL * 1024ULL) #define ZIP_MAX_SIZE_UNCOMPRESSED (1024ULL * ZIP_MiB) /*****************************************************************************/ -/****************************** Internal types *******************************/ +/******************************* Private types *******************************/ /*****************************************************************************/ /*****************************************************************************/ @@ -67,11 +67,11 @@ extern struct Globals Gbl; /*****************************************************************************/ -/************************* Internal global variables *************************/ +/************************* Private global variables **************************/ /*****************************************************************************/ /*****************************************************************************/ -/***************************** Internal prototypes ***************************/ +/***************************** Private prototypes ****************************/ /*****************************************************************************/ static void ZIP_PutLinkToCreateZIPAsgWrkParams (void);