Skip to content

Commit

Permalink
cleaned up warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@ErichStyger
ErichStyger committed Apr 21, 2014
1 parent a0269dd commit 5c0094b
Show file tree
Hide file tree
Showing 14 changed files with 520 additions and 39 deletions.
229 changes: 219 additions & 10 deletions Beans/minIni/minIni.bean
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Name>minIni</Name>
<Description>minIni is a programmer’s library to read and write 'ini' files in embedded systems.</Description>
<Author>Erich Styger</Author>
<Version>01.016</Version>
<Version>01.023</Version>
<Icon>CPU_CHIP</Icon>
<TypesFiles>PE,minIni\minIni</TypesFiles>
<FileVersion>6</FileVersion>
Expand Down Expand Up @@ -50,18 +50,49 @@
</TStrgItem>
</Property>
<Property>
<TInhrLinkItem>
<TGrupItem>
<Name>FatFS</Name>
<Symbol>FatFS</Symbol>
<TypeSpec>minIni\FatFS</TypeSpec>
<Hint>Link to FatFS (FAT File System) component.</Hint>
<Symbol>FatFSGroup</Symbol>
<Hint>FatFS configuration items</Hint>
<ItemLevel>BASIC</ItemLevel>
<BoldName>true</BoldName>
<EditLine>false</EditLine>
<DefaultValue/>
<CanDelete>false</CanDelete>
<IconPopup>false</IconPopup>
<SortStyle/>
</TInhrLinkItem>
<Description/>
<Expanded>Yes</Expanded>
<Children>
<GrupItem>
<TInhrLinkItem>
<Name>FatFS</Name>
<Symbol>FatFS</Symbol>
<TypeSpec>minIni\FatFS</TypeSpec>
<Hint>Link to FatFS (FAT File System) component.</Hint>
<ItemLevel>BASIC</ItemLevel>
<EditLine>false</EditLine>
<DefaultValue/>
<CanDelete>false</CanDelete>
<IconPopup>false</IconPopup>
<SortStyle/>
</TInhrLinkItem>
</GrupItem>
<GrupItem>
<TIntgItem>
<Name>Buffer Size</Name>
<Symbol>FatFsIniBufferSize</Symbol>
<Hint>Configures the macro INI_BUFFERSIZE which configures the maximum line length adn maxium path length.</Hint>
<ItemLevel>BASIC</ItemLevel>
<EditLine>true</EditLine>
<DefaultValue>64</DefaultValue>
<MinValue>2</MinValue>
<MaxValue>-1</MaxValue>
<Bases>DEC</Bases>
<DefaultBase>DEC</DefaultBase>
<ExtraHintDisabled>false</ExtraHintDisabled>
<ChangeValueIntoRange>false</ChangeValueIntoRange>
<RuntimeProperty>false</RuntimeProperty>
</TIntgItem>
</GrupItem>
</Children>
</TGrupItem>
</Property>
</PropertyList>
<MethodList>
Expand Down Expand Up @@ -127,6 +158,184 @@ A false boolean is found if one of the following is matched:\n
</Declarations>
</TMthdItem>
</Method>
<Method>
<TMthdItem>
<Name>ini_getl</Name>
<Symbol>ini_getl</Symbol>
<TypeSpec>typeMethod</TypeSpec>
<Hint>Return the long integral value for a given section and key.</Hint>
<ItemLevel>BASIC</ItemLevel>
<EditLine>false</EditLine>
<TypeSpecNameChangeAble>false</TypeSpecNameChangeAble>
<DefaultIndex>0</DefaultIndex>
<TextValueIndex>false</TextValueIndex>
<RuntimeProperty>false</RuntimeProperty>
<CanDelete>false</CanDelete>
<IconPopup>false</IconPopup>
<DefaultValue>true</DefaultValue>
<Popup>false</Popup>
<PublicMethod>true</PublicMethod>
<IsAssembler>false</IsAssembler>
<InDefinition>true</InDefinition>
<ReturnType>long</ReturnType>
<RetHint>The value located at Key</RetHint>
<ParamCount>4</ParamCount>
<Parameter>
<ParName>Section</ParName>
<ParType>8bit unsigned</ParType>
<ParPassing>Address</ParPassing>
<ParHint>The name of the section to search for</ParHint>
<ParUserDeclaration>const mTCHAR *Section</ParUserDeclaration>
</Parameter>
<Parameter>
<ParName>Key</ParName>
<ParType>char</ParType>
<ParPassing>Address</ParPassing>
<ParHint>Pointer to the name of the entry to find the value of</ParHint>
<ParUserDeclaration>const mTCHAR *Key</ParUserDeclaration>
</Parameter>
<Parameter>
<ParName>DefValue</ParName>
<ParType>long</ParType>
<ParPassing>Value</ParPassing>
<ParHint>Default value in the event of a failed read</ParHint>
</Parameter>
<Parameter>
<ParName>Filename</ParName>
<ParType>char</ParType>
<ParPassing>Address</ParPassing>
<ParHint>The name and full path of the .ini file to read from</ParHint>
<ParUserDeclaration>const mTCHAR *Filename</ParUserDeclaration>
</Parameter>
<Scope>PRIVATE</Scope>
<Declarations>
<ANSIC>long #M#_#C#(const mTCHAR *Section, const mTCHAR *Key, long DefValue, const mTCHAR *Filename)</ANSIC>
</Declarations>
</TMthdItem>
</Method>
<Method>
<TMthdItem>
<Name>ini_gets</Name>
<Symbol>ini_gets</Symbol>
<TypeSpec>typeMethod</TypeSpec>
<Hint>Return the string for a given section and key.</Hint>
<ItemLevel>BASIC</ItemLevel>
<EditLine>false</EditLine>
<TypeSpecNameChangeAble>false</TypeSpecNameChangeAble>
<DefaultIndex>0</DefaultIndex>
<TextValueIndex>false</TextValueIndex>
<RuntimeProperty>false</RuntimeProperty>
<CanDelete>false</CanDelete>
<IconPopup>false</IconPopup>
<DefaultValue>true</DefaultValue>
<Popup>false</Popup>
<PublicMethod>true</PublicMethod>
<IsAssembler>false</IsAssembler>
<InDefinition>true</InDefinition>
<ReturnType>int</ReturnType>
<RetHint>The number of characters copied into the supplied buffer</RetHint>
<ParamCount>6</ParamCount>
<Parameter>
<ParName>Section</ParName>
<ParType>8bit unsigned</ParType>
<ParPassing>Address</ParPassing>
<ParHint>The name of the section to search for</ParHint>
<ParUserDeclaration>const mTCHAR *Section</ParUserDeclaration>
</Parameter>
<Parameter>
<ParName>Key</ParName>
<ParType>char</ParType>
<ParPassing>Address</ParPassing>
<ParHint>Pointer to the name of the entry to find the value of</ParHint>
<ParUserDeclaration>const mTCHAR *Key</ParUserDeclaration>
</Parameter>
<Parameter>
<ParName>DefValue</ParName>
<ParType>char</ParType>
<ParPassing>Address</ParPassing>
<ParHint>Pointer to the default value in the event of a failed read</ParHint>
<ParUserDeclaration>const mTCHAR *DefValue</ParUserDeclaration>
</Parameter>
<Parameter>
<ParName>Buffer</ParName>
<ParType>8bit unsigned</ParType>
<ParPassing>Address</ParPassing>
<ParHint>A pointer to the buffer to copy into</ParHint>
<ParUserDeclaration>nTCHAR *Buffer</ParUserDeclaration>
</Parameter>
<Parameter>
<ParName>BufferSize</ParName>
<ParType>int</ParType>
<ParPassing>Value</ParPassing>
<ParHint>The maximum number of characters to copy</ParHint>
</Parameter>
<Parameter>
<ParName>Filename</ParName>
<ParType>char</ParType>
<ParPassing>Address</ParPassing>
<ParHint>The name and full path of the .ini file to read from</ParHint>
<ParUserDeclaration>const mTCHAR *Filename</ParUserDeclaration>
</Parameter>
<Scope>PRIVATE</Scope>
<Declarations>
<ANSIC>int #M#_#C#(const mTCHAR *Section, const mTCHAR *Key, const mTCHAR *DefValue, nTCHAR *Buffer, int BufferSize, const mTCHAR *Filename)</ANSIC>
</Declarations>
</TMthdItem>
</Method>
<Method>
<TMthdItem>
<Name>ini_getsection</Name>
<Symbol>ini_getsection</Symbol>
<TypeSpec>typeMethod</TypeSpec>
<Hint>Return the key inside a section</Hint>
<ItemLevel>BASIC</ItemLevel>
<EditLine>false</EditLine>
<TypeSpecNameChangeAble>false</TypeSpecNameChangeAble>
<DefaultIndex>0</DefaultIndex>
<TextValueIndex>false</TextValueIndex>
<RuntimeProperty>false</RuntimeProperty>
<CanDelete>false</CanDelete>
<IconPopup>false</IconPopup>
<DefaultValue>true</DefaultValue>
<Popup>false</Popup>
<PublicMethod>true</PublicMethod>
<IsAssembler>false</IsAssembler>
<InDefinition>true</InDefinition>
<ReturnType>int</ReturnType>
<RetHint>The number of characters copied into the supplied buffer</RetHint>
<ParamCount>4</ParamCount>
<Parameter>
<ParName>idx</ParName>
<ParType>int</ParType>
<ParPassing>Value</ParPassing>
<ParHint>The zero-based sequence number of the section to return</ParHint>
</Parameter>
<Parameter>
<ParName>Buffer</ParName>
<ParType>char</ParType>
<ParPassing>Address</ParPassing>
<ParHint>A pointer to the buffer to copy into</ParHint>
<ParUserDeclaration>mTCHAR *Buffer</ParUserDeclaration>
</Parameter>
<Parameter>
<ParName>BufferSize</ParName>
<ParType>int</ParType>
<ParPassing>Value</ParPassing>
<ParHint>The maximum number of characters to copy</ParHint>
</Parameter>
<Parameter>
<ParName>Filename</ParName>
<ParType>char</ParType>
<ParPassing>Address</ParPassing>
<ParHint>The name and full path of the .ini file to read from</ParHint>
<ParUserDeclaration>const mTCHAR *Filename</ParUserDeclaration>
</Parameter>
<Scope>PRIVATE</Scope>
<Declarations>
<ANSIC>int #M#_#C#(int idx, mTCHAR *Buffer, int BufferSize, const mTCHAR *Filename)</ANSIC>
</Declarations>
</TMthdItem>
</Method>
<Method>
<TMthdItem>
<Name>ini_getkey</Name>
Expand Down
2 changes: 1 addition & 1 deletion Beans/minIni/minIni.uis
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

[USED_FACES]
BeanVersion=01.016
BeanVersion=01.023

InterfacesCount=1

Expand Down
47 changes: 47 additions & 0 deletions Beans/minIni/minIniMethods.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,53 @@
</li>
</ul><br />
</li>
<li><a name="ini_getl">
<b>ini_getl</b></a>
- Return the long integral value for a given section and key.
<ul>
<!---VER_SPEC #ANSIC# DON'T CHANGE THIS LINE-->
<br /><i>ANSIC prototype:</i> long ini_getl(const mTCHAR *Section, const mTCHAR *Key, long DefValue, const mTCHAR *Filename)<br />
<!---VER_SPEC_END DON'T CHANGE THIS LINE-->
<li><i>Section: Pointer to byte</i> - The name of the section to search for</li>
<li><i>Key: Pointer to char</i> - Pointer to the name of the entry to find the value of</li>
<li><i>DefValue:long</i> - Default value in the event of a failed read</li>
<li><i>Filename: Pointer to char</i> - The name and full path of the .ini file to read from</li>
<li><i>Return value:long</i> - The value located at Key
</li>
</ul><br />
</li>
<li><a name="ini_gets">
<b>ini_gets</b></a>
- Return the string for a given section and key.
<ul>
<!---VER_SPEC #ANSIC# DON'T CHANGE THIS LINE-->
<br /><i>ANSIC prototype:</i> int ini_gets(const mTCHAR *Section, const mTCHAR *Key, const mTCHAR *DefValue, nTCHAR *Buffer, int BufferSize, const mTCHAR *Filename)<br />
<!---VER_SPEC_END DON'T CHANGE THIS LINE-->
<li><i>Section: Pointer to byte</i> - The name of the section to search for</li>
<li><i>Key: Pointer to char</i> - Pointer to the name of the entry to find the value of</li>
<li><i>DefValue: Pointer to char</i> - Pointer to the default value in the event of a failed read</li>
<li><i>Buffer: Pointer to byte</i> - A pointer to the buffer to copy into</li>
<li><i>BufferSize:int</i> - The maximum number of characters to copy</li>
<li><i>Filename: Pointer to char</i> - The name and full path of the .ini file to read from</li>
<li><i>Return value:int</i> - The number of characters copied into the supplied buffer
</li>
</ul><br />
</li>
<li><a name="ini_getsection">
<b>ini_getsection</b></a>
- Return the key inside a section
<ul>
<!---VER_SPEC #ANSIC# DON'T CHANGE THIS LINE-->
<br /><i>ANSIC prototype:</i> int ini_getsection(int idx, mTCHAR *Buffer, int BufferSize, const mTCHAR *Filename)<br />
<!---VER_SPEC_END DON'T CHANGE THIS LINE-->
<li><i>idx:int</i> - The zero-based sequence number of the section to return</li>
<li><i>Buffer: Pointer to char</i> - A pointer to the buffer to copy into</li>
<li><i>BufferSize:int</i> - The maximum number of characters to copy</li>
<li><i>Filename: Pointer to char</i> - The name and full path of the .ini file to read from</li>
<li><i>Return value:int</i> - The number of characters copied into the supplied buffer
</li>
</ul><br />
</li>
<li><a name="ini_getkey">
<b>ini_getkey</b></a>
- Return the key inside a section
Expand Down
14 changes: 12 additions & 2 deletions Beans/minIni/minIniProperties.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,18 @@
<b>minIni Version</b></a> - Identifies the minIni version
</li>
<li>
<a name="FatFS">
<b>FatFS</b></a> - Link to FatFS (FAT File System) component.
<a name="FatFSGroup">
<b>FatFS</b></a> - FatFS configuration items
<ul>
<li>
<a name="FatFS">
<b>FatFS</b></a> - Link to FatFS (FAT File System) component.
</li>
<li>
<a name="FatFsIniBufferSize">
<b>Buffer Size</b></a> - Configures the macro INI_BUFFERSIZE which configures the maximum line length adn maxium path length.
</li>
</ul>
</li>

</ul>
Expand Down
24 changes: 24 additions & 0 deletions Drivers/Common/minIniini_getl.Inc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
%- AUTOREGENERATE If you remove this line, this file cannot be rewrited (by default)
%ifndef CommentLine
%{
%endif CommentLine
%;** ===================================================================
%include Common\GeneralMethod.inc (ini_getl)
%;** Description :
%;** Return the long integral value for a given section and key.
%include Common\GeneralParameters.inc(27)
%;** * Section%ParSection %>27 - The name of the section to search
%;** %>29 for
%;** * Key%ParKey %>27 - Pointer to the name of the entry to find
%;** %>29 the value of
%;** DefValue%ParDefValue %>27 - Default value in the event of a
%;** %>29 failed read
%;** * Filename%ParFilename %>27 - The name and full path of the .
%;** %>29 ini file to read from
%;** Returns :
%;** ---%RetVal %>27 - The value located at Key
%include Common\GeneralDamage.inc
%;** ===================================================================
%ifndef CommentLine
%}
%endif CommentLine
28 changes: 28 additions & 0 deletions Drivers/Common/minIniini_gets.Inc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
%- AUTOREGENERATE If you remove this line, this file cannot be rewrited (by default)
%ifndef CommentLine
%{
%endif CommentLine
%;** ===================================================================
%include Common\GeneralMethod.inc (ini_gets)
%;** Description :
%;** Return the string for a given section and key.
%include Common\GeneralParameters.inc(27)
%;** * Section%ParSection %>27 - The name of the section to search
%;** %>29 for
%;** * Key%ParKey %>27 - Pointer to the name of the entry to find
%;** %>29 the value of
%;** * DefValue%ParDefValue %>27 - Pointer to the default value in
%;** %>29 the event of a failed read
%;** * Buffer%ParBuffer %>27 - A pointer to the buffer to copy into
%;** BufferSize%ParBufferSize %>27 - The maximum number of
%;** %>29 characters to copy
%;** * Filename%ParFilename %>27 - The name and full path of the .
%;** %>29 ini file to read from
%;** Returns :
%;** ---%RetVal %>27 - The number of characters copied into the
%;** %>29 supplied buffer
%include Common\GeneralDamage.inc
%;** ===================================================================
%ifndef CommentLine
%}
%endif CommentLine
Loading

0 comments on commit 5c0094b

Please sign in to comment.