Merge branch 'stable-0.15' of git://git.qemu.org/qemu

[qemu.git] / cmd.h

diff --git a/cmd.h b/cmd.h
index 5ca8fcf0783c548a09f2d530ce97c5b5a1022793..b763b198c4e1511919ff32590da7f9915020a57e 100644 (file)
--- a/cmd.h
+++ b/cmd.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef __COMMAND_H__
 #define __COMMAND_H__
@@ -39,33 +38,33 @@ typedef struct cmdinfo {
 extern cmdinfo_t       *cmdtab;
 extern int             ncmds;
 
-extern void            help_init(void);
-extern void            quit_init(void);
+void help_init(void);
+void quit_init(void);
 
 typedef int (*argsfunc_t)(int index);
 typedef int (*checkfunc_t)(const cmdinfo_t *ci);
 
-extern void            add_command(const cmdinfo_t *ci);
-extern void            add_user_command(char *optarg);
-extern void            add_args_command(argsfunc_t af);
-extern void            add_check_command(checkfunc_t cf);
+void add_command(const cmdinfo_t *ci);
+void add_user_command(char *optarg);
+void add_args_command(argsfunc_t af);
+void add_check_command(checkfunc_t cf);
 
-extern const cmdinfo_t *find_command(const char *cmd);
+const cmdinfo_t *find_command(const char *cmd);
 
-extern void            command_loop(void);
-extern int             command_usage(const cmdinfo_t *ci);
-extern int             command(const cmdinfo_t *ci, int argc, char **argv);
+void command_loop(void);
+int command_usage(const cmdinfo_t *ci);
+int command(const cmdinfo_t *ci, int argc, char **argv);
 
 /* from input.h */
-extern char    **breakline(char *input, int *count);
-extern void    doneline(char *input, char **vec);
-extern char    *fetchline(void);
+char **breakline(char *input, int *count);
+void doneline(char *input, char **vec);
+char *fetchline(void);
 
-extern long long cvtnum(char *s);
-extern void    cvtstr(double value, char *str, size_t sz);
+long long cvtnum(char *s);
+void cvtstr(double value, char *str, size_t sz);
 
-extern struct timeval tsub(struct timeval t1, struct timeval t2);
-extern double  tdiv(double value, struct timeval tv);
+struct timeval tsub(struct timeval t1, struct timeval t2);
+double tdiv(double value, struct timeval tv);
 
 enum {
        DEFAULT_TIME            = 0x0,
@@ -73,6 +72,8 @@ enum {
        VERBOSE_FIXED_TIME      = 0x2
 };
 
-extern void    timestr(struct timeval *tv, char *str, size_t sz, int flags);
+void timestr(struct timeval *tv, char *str, size_t sz, int flags);
+
+extern char *progname;
 
 #endif /* __COMMAND_H__ */