diff options
Diffstat (limited to 'mixguile')
| -rw-r--r-- | mixguile/mixguile-commands.scm | 4 | ||||
| -rw-r--r-- | mixguile/mixguile-vm-stat.scm | 4 | ||||
| -rw-r--r-- | mixguile/mixguile.c | 4 | ||||
| -rw-r--r-- | mixguile/mixguile.h | 4 | ||||
| -rw-r--r-- | mixguile/mixguile.scm | 14 | ||||
| -rw-r--r-- | mixguile/mixguile_cmd_dispatcher.c | 26 | ||||
| -rw-r--r-- | mixguile/mixguile_cmd_dispatcher.h | 14 | ||||
| -rw-r--r-- | mixguile/mixguile_main.c | 4 | ||||
| -rw-r--r-- | mixguile/xmixguile_cmd_dispatcher.c | 4 | ||||
| -rw-r--r-- | mixguile/xmixguile_cmd_dispatcher.h | 18 | 
10 files changed, 44 insertions, 52 deletions
diff --git a/mixguile/mixguile-commands.scm b/mixguile/mixguile-commands.scm index 96bd3a0..ba62a7e 100644 --- a/mixguile/mixguile-commands.scm +++ b/mixguile/mixguile-commands.scm @@ -1,11 +1,11 @@  ;; -*-scheme-*- -------------- mixguile-commands.scm :  ;  mixvm commands implementation using the mixvm-cmd primitive  ;  ------------------------------------------------------------------ -;  Copyright (C) 2001, 2006 Free Software Foundation, Inc. +;  Copyright (C) 2001, 2006, 2007 Free Software Foundation, Inc.  ;  ;  This program is free software; you can redistribute it and/or modify  ;  it under the terms of the GNU General Public License as published by -;  the Free Software Foundation; either version 2 of the License, or +;  the Free Software Foundation; either version 3 of the License, or  ;  (at your option) any later version.  ;  ;  This program is distributed in the hope that it will be useful, diff --git a/mixguile/mixguile-vm-stat.scm b/mixguile/mixguile-vm-stat.scm index 60f25a5..7414871 100644 --- a/mixguile/mixguile-vm-stat.scm +++ b/mixguile/mixguile-vm-stat.scm @@ -1,11 +1,11 @@  ;; -*-scheme-*- -------------- mixguile-vm-stat.scm :  ;  mixvm status functions  ;  ------------------------------------------------------------------ -;  Copyright (C) 2001, 2006 Free Software Foundation, Inc. +;  Copyright (C) 2001, 2006, 2007 Free Software Foundation, Inc.  ;  ;  This program is free software; you can redistribute it and/or modify  ;  it under the terms of the GNU General Public License as published by -;  the Free Software Foundation; either version 2 of the License, or +;  the Free Software Foundation; either version 3 of the License, or  ;  (at your option) any later version.  ;  ;  This program is distributed in the hope that it will be useful, diff --git a/mixguile/mixguile.c b/mixguile/mixguile.c index 104baea..55483fe 100644 --- a/mixguile/mixguile.c +++ b/mixguile/mixguile.c @@ -1,11 +1,11 @@  /* -*-c-*- -------------- mixguile.c :   * Implementation of the functions declared in mixguile.h   * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2006, 2007 Free Software Foundation, Inc.   *   * This program is free software; you can redistribute it and/or modify   * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or   * (at your option) any later version.   *   * This program is distributed in the hope that it will be useful, diff --git a/mixguile/mixguile.h b/mixguile/mixguile.h index aacb26e..3481433 100644 --- a/mixguile/mixguile.h +++ b/mixguile/mixguile.h @@ -1,11 +1,11 @@  /* -*-c-*- ---------------- mixguile.h :   * Interface to the mixguile interpreter.   * ------------------------------------------------------------------ - * Copyright (C) 2001, 2006 Free Software Foundation, Inc. + * Copyright (C) 2001, 2006, 2007 Free Software Foundation, Inc.   *   * This program is free software; you can redistribute it and/or modify   * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or   * (at your option) any later version.   *   * This program is distributed in the hope that it will be useful, diff --git a/mixguile/mixguile.scm b/mixguile/mixguile.scm index 4e7dcbe..52df6f8 100644 --- a/mixguile/mixguile.scm +++ b/mixguile/mixguile.scm @@ -1,24 +1,22 @@  ;; -*-scheme-*- -------------- mixguile.scm :  ;  mixguile bootstrap file  ;  ------------------------------------------------------------------ -;   Last change: Time-stamp: "01/09/05 01:05:29 jao" -;  ------------------------------------------------------------------ -;  Copyright (C) 2001 Free Software Foundation, Inc. -;    +;  Copyright (C) 2001, 2007 Free Software Foundation, Inc. +;  ;  This program is free software; you can redistribute it and/or modify  ;  it under the terms of the GNU General Public License as published by -;  the Free Software Foundation; either version 2 of the License, or +;  the Free Software Foundation; either version 3 of the License, or  ;  (at your option) any later version. -;    +;  ;  This program is distributed in the hope that it will be useful,  ;  but WITHOUT ANY WARRANTY; without even the implied warranty of  ;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  ;  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 to the Free Software  ;  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -;    +;  ;;  (load "mixguile-commands.scm") diff --git a/mixguile/mixguile_cmd_dispatcher.c b/mixguile/mixguile_cmd_dispatcher.c index 2cc243b..e5b9cce 100644 --- a/mixguile/mixguile_cmd_dispatcher.c +++ b/mixguile/mixguile_cmd_dispatcher.c @@ -1,24 +1,22 @@  /* -*-c-*- -------------- mixguile_cmd_dispatcher.c :   * Implementation of the functions declared in mixguile_cmd_dispatcher.h   * ------------------------------------------------------------------ - *  Last change: Time-stamp: "01/08/22 02:29:34 jao" - * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. - *   + * Copyright (C) 2001, 2007 Free Software Foundation, Inc. + *   * This program is free software; you can redistribute it and/or modify   * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or   * (at your option) any later version. - *   + *   * This program is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   * 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 to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - *   + *   */  #include <stdio.h> @@ -53,7 +51,7 @@ static mix_vm_command_info_t commands_[] = {    { SCMF_CMD, cmd_scmf_, N_("Eval Scheme file using Guile"), "scm PATH"},    {NULL}  }; -   +  /* create/destroy cmd dispatcher */  mixguile_cmd_dispatcher_t *  mixguile_cmd_dispatcher_new (mix_vm_cmd_dispatcher_t *dis) @@ -61,9 +59,9 @@ mixguile_cmd_dispatcher_new (mix_vm_cmd_dispatcher_t *dis)    static gboolean REGISTERED = FALSE;    mixguile_cmd_dispatcher_t *result = NULL;    int k = 0; -   +    g_return_val_if_fail (dis != NULL, NULL); -   +    if (!REGISTERED)      {        register_scm_commands_ (DEFAULT_SCM_COMMANDS_); @@ -72,15 +70,15 @@ mixguile_cmd_dispatcher_new (mix_vm_cmd_dispatcher_t *dis)    result = g_new (mixguile_cmd_dispatcher_t, 1);    result->dispatcher = dis; -   +    while (commands_[k].name)      {        mix_vm_cmd_dispatcher_register_new (dis, commands_ + k);        ++k;      } -   +    register_cmd_dispatcher_ (result); -   +    return result;  } diff --git a/mixguile/mixguile_cmd_dispatcher.h b/mixguile/mixguile_cmd_dispatcher.h index 1b10510..3288642 100644 --- a/mixguile/mixguile_cmd_dispatcher.h +++ b/mixguile/mixguile_cmd_dispatcher.h @@ -1,24 +1,22 @@  /* -*-c-*- ---------------- mixguile_cmd_dispatcher.h :   * Command dispatcher with guile support   * ------------------------------------------------------------------ - *  Last change: Time-stamp: <01/08/22 01:15:23 jao> - * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. - *   + * Copyright (C) 2001, 2007 Free Software Foundation, Inc. + *   * This program is free software; you can redistribute it and/or modify   * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or   * (at your option) any later version. - *   + *   * This program is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   * 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 to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - *   + *   */ diff --git a/mixguile/mixguile_main.c b/mixguile/mixguile_main.c index faee06a..0a25bb0 100644 --- a/mixguile/mixguile_main.c +++ b/mixguile/mixguile_main.c @@ -1,11 +1,11 @@  /* -*-c-*- -------------- mixguile_main.c :   * Main function for mixguile, the MIX Guile shell   * ------------------------------------------------------------------ - * Copyright (C) 2001, 2006 Free Software Foundation, Inc. + * Copyright (C) 2001, 2006, 2007 Free Software Foundation, Inc.   *   * This program is free software; you can redistribute it and/or modify   * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or   * (at your option) any later version.   *   * This program is distributed in the hope that it will be useful, diff --git a/mixguile/xmixguile_cmd_dispatcher.c b/mixguile/xmixguile_cmd_dispatcher.c index 2523ea7..9bc76a1 100644 --- a/mixguile/xmixguile_cmd_dispatcher.c +++ b/mixguile/xmixguile_cmd_dispatcher.c @@ -1,11 +1,11 @@  /* -*-c-*- -------------- xmixguile_cmd_dispatcher.c :   * Implementation of the functions declared in xmixguile_cmd_dispatcher.h   * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.   *   * This program is free software; you can redistribute it and/or modify   * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or   * (at your option) any later version.   *   * This program is distributed in the hope that it will be useful, diff --git a/mixguile/xmixguile_cmd_dispatcher.h b/mixguile/xmixguile_cmd_dispatcher.h index f7ef756..f6d987a 100644 --- a/mixguile/xmixguile_cmd_dispatcher.h +++ b/mixguile/xmixguile_cmd_dispatcher.h @@ -1,24 +1,22 @@  /* -*-c-*- ---------------- xmixguile_cmd_dispatcher.h :   * Internal declarations for mixguile_cmd_dispatcher_t   * ------------------------------------------------------------------ - *  Last change: Time-stamp: <01/08/22 01:11:20 jao> - * ------------------------------------------------------------------ - * Copyright (C) 2001 Free Software Foundation, Inc. - *   + * Copyright (C) 2001, 2007 Free Software Foundation, Inc. + *   * This program is free software; you can redistribute it and/or modify   * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or   * (at your option) any later version. - *   + *   * This program is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   * 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 to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - *   + *   */ @@ -32,7 +30,7 @@  #include "mixguile_cmd_dispatcher.h"  /* the cmd dispatcher type */ -struct mixguile_cmd_dispatcher_t  +struct mixguile_cmd_dispatcher_t  {    mix_vm_cmd_dispatcher_t *dispatcher;  }; @@ -42,7 +40,7 @@ struct mixguile_cmd_dispatcher_t  typedef SCM (*scm_func_t) ();  /* record for a new scm command */ -typedef struct scm_command_t  +typedef struct scm_command_t  {    gchar *name;			/* name of the scheme command */    scm_func_t func;		/* implementation of the command */  | 
