Attachment #198634 for bug #272602

View | Details | Raw Unified | Return to bug 272602
Collapse All | Expand All




}


bool IniConfig::readInt (ini_fd_t ini, const char *key, int &value)
{
    int i = value;
    if (ini_locateKey (ini, key) < 0)

}


bool IniConfig::readString (ini_fd_t ini, const char *key, char *&str)
{
    char  *ret;
    size_t length;

}


bool IniConfig::readBool (ini_fd_t ini, const char *key, bool &boolean)
{
    int b = boolean;
    if (ini_locateKey (ini, key) < 0)

}


bool IniConfig::readChar (ini_fd_t ini, const char *key, char &ch)
{
    char *str, c = 0;
    bool  ret = readString (ini, key, str);

}


bool IniConfig::readTime (ini_fd_t ini, const char *key, int &value)
{
    char *str, *sep;
    int   time;

Lines 98-108 Link Here

(-)ori/src/IniConfig.h (-5 / +5 lines)
98	protected:	98	protected:
99	void clear ();	99	void clear ();
100		100
101	bool readInt (ini_fd_t ini, char *key, int &value);	101	bool readInt (ini_fd_t ini, const char *key, int &value);
102	bool readString (ini_fd_t ini, char key, char &str);	102	bool readString (ini_fd_t ini, const char key, char &str);
103	bool readBool (ini_fd_t ini, char *key, bool &boolean);	103	bool readBool (ini_fd_t ini, const char *key, bool &boolean);
104	bool readChar (ini_fd_t ini, char *key, char &ch);	104	bool readChar (ini_fd_t ini, const char *key, char &ch);
105	bool readTime (ini_fd_t ini, char *key, int &time);	105	bool readTime (ini_fd_t ini, const char *key, int &time);
106		106
107	bool readSidplay2 (ini_fd_t ini);	107	bool readSidplay2 (ini_fd_t ini);
108	bool readConsole (ini_fd_t ini);	108	bool readConsole (ini_fd_t ini);




#include <stdlib.h>
#include <string.h>
#include <iostream>
#include <string>
using std::cout;
using std::cerr;
using std::endl;

// Convert time from integer
bool ConsolePlayer::parseTime (const char *str, uint_least32_t &time)
{
    const char *sep;
    uint_least32_t _time;

    // Check for empty string

    else
    {   // Read in MM:SS format
        int val;
        val  = atoi (std::string(str, sep - str).c_str());
        val  = atoi (str);
        if (val < 0 || val > 99)
            return false;
        _time = (uint_least32_t) val * 60;

Lines 43-49 Link Here

(-)ori/src/audio/AudioBase.h (-1 / +1 lines)
43	{	43	{
44	protected:	44	protected:
45	AudioConfig _settings;	45	AudioConfig _settings;
46	char *_errorString;	46	const char *_errorString;
47	void *_sampleBuffer;	47	void *_sampleBuffer;
48		48
49	public:	49	public:

Lines 353-359 Link Here

(-)ori/src/menu.cpp (-1 / +1 lines)
353	{	353	{
354	if ((m_iniCfg.console ()).ansi)	354	if ((m_iniCfg.console ()).ansi)
355	{	355	{
356	char *mode = "";	356	const char *mode = "";
357		357
358	switch (colour)	358	switch (colour)
359	{	359	{

Return to bug 272602

Lines 120-126 Link Here

(-)ori/src/IniConfig.cpp (-5 / +5 lines)
120	}	120	}
121		121
122		122
123	bool IniConfig::readInt (ini_fd_t ini, char *key, int &value)	123	bool IniConfig::readInt (ini_fd_t ini, const char *key, int &value)
124	{	124	{
125	int i = value;	125	int i = value;
126	if (ini_locateKey (ini, key) < 0)	126	if (ini_locateKey (ini, key) < 0)
Lines 134-140 Link Here
134	}	134	}
135		135
136		136
137	bool IniConfig::readString (ini_fd_t ini, char key, char &str)	137	bool IniConfig::readString (ini_fd_t ini, const char key, char &str)
138	{	138	{
139	char *ret;	139	char *ret;
140	size_t length;	140	size_t length;
Lines 165-171 Link Here
165	}	165	}
166		166
167		167
168	bool IniConfig::readBool (ini_fd_t ini, char *key, bool &boolean)	168	bool IniConfig::readBool (ini_fd_t ini, const char *key, bool &boolean)
169	{	169	{
170	int b = boolean;	170	int b = boolean;
171	if (ini_locateKey (ini, key) < 0)	171	if (ini_locateKey (ini, key) < 0)
Lines 179-185 Link Here
179	}	179	}
180		180
181		181
182	bool IniConfig::readChar (ini_fd_t ini, char *key, char &ch)	182	bool IniConfig::readChar (ini_fd_t ini, const char *key, char &ch)
183	{	183	{
184	char *str, c = 0;	184	char *str, c = 0;
185	bool ret = readString (ini, key, str);	185	bool ret = readString (ini, key, str);
Lines 206-212 Link Here
206	}	206	}
207		207
208		208
209	bool IniConfig::readTime (ini_fd_t ini, char *key, int &value)	209	bool IniConfig::readTime (ini_fd_t ini, const char *key, int &value)
210	{	210	{
211	char str, sep;	211	char str, sep;
212	int time;	212	int time;

Lines 77-82 Link Here

(-)ori/src/args.cpp (-3 / +3 lines)
77	#include <stdlib.h>	77	#include <stdlib.h>
78	#include <string.h>	78	#include <string.h>
79	#include <iostream>	79	#include <iostream>
		80	#include <string>
80	using std::cout;	81	using std::cout;
81	using std::cerr;	82	using std::cerr;
82	using std::endl;	83	using std::endl;
Lines 95-101 Link Here
95	// Convert time from integer	96	// Convert time from integer
96	bool ConsolePlayer::parseTime (const char *str, uint_least32_t &time)	97	bool ConsolePlayer::parseTime (const char *str, uint_least32_t &time)
97	{	98	{
98	char *sep;	99	const char *sep;
99	uint_least32_t _time;	100	uint_least32_t _time;
100		101
101	// Check for empty string	102	// Check for empty string
Lines 110-117 Link Here
110	else	111	else
111	{ // Read in MM:SS format	112	{ // Read in MM:SS format
112	int val;	113	int val;
113	*sep = '\0';	114	val = atoi (std::string(str, sep - str).c_str());
114	val = atoi (str);
115	if (val < 0 \|\| val > 99)	115	if (val < 0 \|\| val > 99)
116	return false;	116	return false;
117	_time = (uint_least32_t) val * 60;	117	_time = (uint_least32_t) val * 60;