summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPerberos <[email protected]>2012-07-31 21:05:06 -0300
committerPerberos <[email protected]>2012-07-31 21:05:06 -0300
commit7066f9a921a6695ea9c8e2dae2c6fd230add6baa (patch)
treeefcbc3f84901908b0965cc6f535f01836cee7c1a /src
parent88ab1796d36b39f08d9cd6156fdd5b5d6df19dd1 (diff)
downloadmate-calc-7066f9a921a6695ea9c8e2dae2c6fd230add6baa.tar.bz2
mate-calc-7066f9a921a6695ea9c8e2dae2c6fd230add6baa.tar.xz
fixing address issue of fsf
Diffstat (limited to 'src')
-rw-r--r--src/financial.c4
-rw-r--r--src/financial.h4
-rw-r--r--src/mate-calc-cmd.c20
-rw-r--r--src/mate-calc.c4
-rw-r--r--src/math-buttons.c4
-rw-r--r--src/math-buttons.h4
-rw-r--r--src/math-display.c10
-rw-r--r--src/math-display.h4
-rw-r--r--src/math-equation.c60
-rw-r--r--src/math-equation.h4
-rw-r--r--src/math-preferences.c8
-rw-r--r--src/math-preferences.h4
-rw-r--r--src/math-variables.c4
-rw-r--r--src/math-variables.h4
-rw-r--r--src/math-window.c4
-rw-r--r--src/math-window.h4
-rw-r--r--src/mp-binary.c4
-rw-r--r--src/mp-convert.c14
-rw-r--r--src/mp-equation-lexer.l4
-rw-r--r--src/mp-equation-parser.y10
-rw-r--r--src/mp-equation-private.h4
-rw-r--r--src/mp-equation.c10
-rw-r--r--src/mp-equation.h4
-rw-r--r--src/mp-private.h4
-rw-r--r--src/mp-trigonometric.c6
-rw-r--r--src/mp.c30
-rw-r--r--src/mp.h4
-rw-r--r--src/unittest.c4
-rw-r--r--src/unittest.h4
29 files changed, 124 insertions, 124 deletions
diff --git a/src/financial.c b/src/financial.c
index 94a21c0..f388be3 100644
--- a/src/financial.c
+++ b/src/financial.c
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <glib/gi18n.h>
diff --git a/src/financial.h b/src/financial.h
index 9a6cbe9..53022d0 100644
--- a/src/financial.h
+++ b/src/financial.h
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#ifndef FINANCIAL_H
diff --git a/src/mate-calc-cmd.c b/src/mate-calc-cmd.c
index 9af9a58..796941b 100644
--- a/src/mate-calc-cmd.c
+++ b/src/mate-calc-cmd.c
@@ -1,21 +1,21 @@
/* $Header$
*
* Copyright (c) 2009 Rich Burridge
- *
+ *
* 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, or (at your option)
* any later version.
- *
- * This program is distributed in the hope that it will be useful, but
+ *
+ * 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
+ * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <stdio.h>
@@ -35,17 +35,17 @@ solve(const char *equation)
MPEquationOptions options;
MPNumber z;
char result_str[MAXLINE];
-
+
memset(&options, 0, sizeof(options));
options.base = 10;
options.wordlen = 32;
options.angle_units = MP_DEGREES;
-
+
ret = mp_equation_parse(equation, &options, &z, NULL);
if (ret == PARSER_ERR_MP)
fprintf(stderr, "Error %s\n", mp_get_error());
- else if (ret)
+ else if (ret)
fprintf(stderr, "Error %d\n", ret);
else {
mp_cast_to_string(&z, 10, 10, 9, 1, result_str, MAXLINE);
diff --git a/src/mate-calc.c b/src/mate-calc.c
index ccc74bd..c8499d4 100644
--- a/src/mate-calc.c
+++ b/src/mate-calc.c
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <stdlib.h>
diff --git a/src/math-buttons.c b/src/math-buttons.c
index 19ca08e..016ca41 100644
--- a/src/math-buttons.c
+++ b/src/math-buttons.c
@@ -12,8 +12,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <glib/gi18n.h>
diff --git a/src/math-buttons.h b/src/math-buttons.h
index 711db6f..e09c4c2 100644
--- a/src/math-buttons.h
+++ b/src/math-buttons.h
@@ -12,8 +12,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#ifndef MATH_BUTTONS_H
diff --git a/src/math-display.c b/src/math-display.c
index 62f0218..b809695 100644
--- a/src/math-display.c
+++ b/src/math-display.c
@@ -12,8 +12,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <string.h>
@@ -247,7 +247,7 @@ create_gui(MathDisplay *display)
{
GtkWidget *info_view;
PangoFontDescription *font_desc;
-
+
g_signal_connect(display, "key-press-event", G_CALLBACK(key_press_cb), display);
display->priv->text_view = gtk_text_view_new_with_buffer(GTK_TEXT_BUFFER(display->priv->equation));
@@ -268,7 +268,7 @@ create_gui(MathDisplay *display)
//FIXME:<property name="AtkObject::accessible-description" translatable="yes" comments="Accessible description for the area in which results are displayed">Result Region</property>
g_signal_connect(display->priv->text_view, "key-press-event", G_CALLBACK(display_key_press_cb), display);
gtk_box_pack_start(GTK_BOX(display), display->priv->text_view, TRUE, TRUE, 0);
-
+
info_view = gtk_text_view_new();
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(info_view), GTK_WRAP_WORD);
gtk_widget_set_can_focus(info_view, TRUE); // FIXME: This should be FALSE but it locks the cursor inside the main view for some reason
@@ -351,7 +351,7 @@ math_display_class_init (MathDisplayClass *klass)
}
-static void
+static void
math_display_init(MathDisplay *display)
{
display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, math_display_get_type(), MathDisplayPrivate);
diff --git a/src/math-display.h b/src/math-display.h
index 7d8718a..0179f17 100644
--- a/src/math-display.h
+++ b/src/math-display.h
@@ -12,8 +12,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#ifndef MATH_DISPLAY_H
diff --git a/src/math-equation.c b/src/math-equation.c
index af68cd1..3450b80 100644
--- a/src/math-equation.c
+++ b/src/math-equation.c
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <stdlib.h>
@@ -94,7 +94,7 @@ struct MathEquationPrivate
GList *undo_stack; /* History of expression mode states */
GList *redo_stack;
gboolean in_undo_operation;
-
+
gboolean in_reformat;
gboolean in_delete;
@@ -123,7 +123,7 @@ static void
get_ans_offsets(MathEquation *equation, gint *start, gint *end)
{
GtkTextIter iter;
-
+
if (!equation->priv->ans_start) {
*start = *end = -1;
return;
@@ -287,7 +287,7 @@ reformat_base(MathEquation *equation, gint old_base)
if (c == '\0')
break;
-
+
read_iter = g_utf8_next_char(read_iter);
offset++;
}
@@ -309,7 +309,7 @@ reformat_separators(MathEquation *equation)
read_iter = text;
while(*read_iter != '\0') {
gunichar c;
-
+
c = g_utf8_get_char(read_iter);
if (strncmp(read_iter, equation->priv->tsep, strlen(equation->priv->tsep)) == 0)
@@ -362,7 +362,7 @@ get_current_state(MathEquation *equation)
state->can_super_minus = equation->priv->can_super_minus;
state->entered_multiply = equation->priv->state.entered_multiply;
state->status = g_strdup(equation->priv->state.status);
-
+
return state;
}
@@ -396,7 +396,7 @@ math_equation_push_undo_stack(MathEquation *equation)
equation->priv->redo_stack = NULL;
state = get_current_state(equation);
- equation->priv->undo_stack = g_list_prepend(equation->priv->undo_stack, state);
+ equation->priv->undo_stack = g_list_prepend(equation->priv->undo_stack, state);
}
@@ -425,7 +425,7 @@ static void
apply_state(MathEquation *equation, MathEquationState *state)
{
GtkTextIter cursor;
-
+
/* Disable undo detection */
equation->priv->in_undo_operation = TRUE;
@@ -489,7 +489,7 @@ math_equation_undo(MathEquation *equation)
{
GList *link;
MathEquationState *state;
-
+
if (!equation->priv->undo_stack) {
math_equation_set_status(equation,
/* Error shown when trying to undo with no undo history */
@@ -686,7 +686,7 @@ math_equation_get_angle_units(MathEquation *equation)
void
math_equation_set_source_currency(MathEquation *equation, const gchar *currency)
{
- // FIXME: Pick based on locale
+ // FIXME: Pick based on locale
if (!currency || currency[0] == '\0')
currency = currency_names[0].short_name;
@@ -707,7 +707,7 @@ math_equation_get_source_currency(MathEquation *equation)
void
math_equation_set_target_currency(MathEquation *equation, const gchar *currency)
{
- // FIXME: Pick based on locale
+ // FIXME: Pick based on locale
if (!currency || currency[0] == '\0')
currency = currency_names[0].short_name;
@@ -734,7 +734,7 @@ math_equation_set_status(MathEquation *equation, const gchar *status)
g_free(equation->priv->state.status);
equation->priv->state.status = g_strdup(status);
- g_object_notify(G_OBJECT(equation), "status");
+ g_object_notify(G_OBJECT(equation), "status");
}
@@ -980,7 +980,7 @@ variable_is_defined(const char *name, void *data)
for (c = lower_name; *c; c++)
*c = tolower(*c);
- if (strcmp(lower_name, "rand") == 0 ||
+ if (strcmp(lower_name, "rand") == 0 ||
strcmp(lower_name, "ans") == 0) {
g_free (lower_name);
return 1;
@@ -1032,7 +1032,7 @@ set_variable(const char *name, const MPNumber *x, void *data)
static int
convert(const MPNumber *x, const char *x_units, const char *z_units, MPNumber *z, void *data)
-{
+{
return currency_convert(x, x_units, z_units, z);
}
@@ -1090,7 +1090,7 @@ math_equation_solve(MathEquation *equation)
g_string_append_c(equation_text, ')');
n_brackets--;
}
-
+
result = parse(equation, equation_text->str, &z, &error_token);
g_string_free(equation_text, TRUE);
@@ -1132,7 +1132,7 @@ math_equation_solve(MathEquation *equation)
if (error_token)
free(error_token);
-
+
if (message) {
math_equation_set_status(equation, message);
g_free(message);
@@ -1146,7 +1146,7 @@ math_equation_factorize(MathEquation *equation)
MPNumber x;
GList *factors, *factor;
GString *text;
-
+
if (!math_equation_get_number(equation, &x) || !mp_is_integer(&x)) {
/* Error displayed when trying to factorize a non-integer value */
math_equation_set_status(equation, _("Need an integer to factorize"));
@@ -1179,7 +1179,7 @@ void
math_equation_delete(MathEquation *equation)
{
gint cursor;
- GtkTextIter start, end;
+ GtkTextIter start, end;
g_object_get(G_OBJECT(equation), "cursor-position", &cursor, NULL);
if (cursor >= gtk_text_buffer_get_char_count(GTK_TEXT_BUFFER(equation)))
@@ -1357,7 +1357,7 @@ math_equation_get_property(GObject *object,
g_value_set_string(value, self->priv->state.status);
break;
case PROP_DISPLAY:
- text = math_equation_get_display(self);
+ text = math_equation_get_display(self);
g_value_set_string(value, text);
g_free(text);
break;
@@ -1433,7 +1433,7 @@ math_equation_class_init (MathEquationClass *klass)
object_class->set_property = math_equation_set_property;
g_type_class_add_private (klass, sizeof (MathEquationPrivate));
-
+
number_mode_type = g_enum_register_static("NumberMode", number_mode_values);
number_format_type = g_enum_register_static("DisplayFormat", number_format_values);
angle_unit_type = g_enum_register_static("AngleUnit", angle_unit_values);
@@ -1501,7 +1501,7 @@ math_equation_class_init (MathEquationClass *klass)
g_param_spec_int("base",
"base",
"Default number base (derived from number-format)",
- 2, 16, 10,
+ 2, 16, 10,
G_PARAM_READWRITE));
g_object_class_install_property(object_class,
PROP_WORD_SIZE,
@@ -1543,10 +1543,10 @@ pre_insert_text_cb (MathEquation *equation,
gpointer user_data)
{
gunichar c;
-
+
if (equation->priv->in_reformat)
return;
-
+
/* If following a delete then have already pushed undo stack (GtkTextBuffer
doesn't indicate replace operations so we have to infer them) */
if (!equation->priv->in_delete)
@@ -1567,7 +1567,7 @@ pre_insert_text_cb (MathEquation *equation,
offset = gtk_text_iter_get_offset(location);
get_ans_offsets(equation, &ans_start, &ans_end);
-
+
/* Inserted inside ans */
if (offset > ans_start && offset < ans_end)
clear_ans(equation, TRUE);
@@ -1578,7 +1578,7 @@ pre_insert_text_cb (MathEquation *equation,
static gboolean
on_delete(MathEquation *equation)
{
- equation->priv->in_delete = FALSE;
+ equation->priv->in_delete = FALSE;
return FALSE;
}
@@ -1588,7 +1588,7 @@ pre_delete_range_cb (MathEquation *equation,
GtkTextIter *start,
GtkTextIter *end,
gpointer user_data)
-{
+{
if (equation->priv->in_reformat)
return;
@@ -1604,7 +1604,7 @@ pre_delete_range_cb (MathEquation *equation,
start_offset = gtk_text_iter_get_offset(start);
end_offset = gtk_text_iter_get_offset(end);
get_ans_offsets(equation, &ans_start, &ans_end);
-
+
/* Deleted part of ans */
if (start_offset < ans_end && end_offset > ans_start)
clear_ans(equation, TRUE);
@@ -1659,7 +1659,7 @@ math_equation_init(MathEquation *equation)
equation->priv->ans_tag = gtk_text_buffer_create_tag(GTK_TEXT_BUFFER(equation), NULL, "weight", PANGO_WEIGHT_BOLD, NULL);
g_signal_connect(equation, "insert-text", G_CALLBACK(pre_insert_text_cb), equation);
- g_signal_connect(equation, "delete-range", G_CALLBACK(pre_delete_range_cb), equation);
+ g_signal_connect(equation, "delete-range", G_CALLBACK(pre_delete_range_cb), equation);
g_signal_connect_after(equation, "insert-text", G_CALLBACK(insert_text_cb), equation);
g_signal_connect_after(equation, "delete-range", G_CALLBACK(delete_range_cb), equation);
@@ -1682,7 +1682,7 @@ math_equation_init(MathEquation *equation)
equation->priv->tsep = tsep ? g_locale_to_utf8(tsep, -1, NULL, NULL, NULL) : g_strdup(",");
equation->priv->tsep_count = 3;
-
+
equation->priv->variables = math_variables_new();
equation->priv->state.status = g_strdup("");
diff --git a/src/math-equation.h b/src/math-equation.h
index 164fec5..c9ebe0c 100644
--- a/src/math-equation.h
+++ b/src/math-equation.h
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#ifndef MATH_EQUATION_H
diff --git a/src/math-preferences.c b/src/math-preferences.c
index c846523..ab651df 100644
--- a/src/math-preferences.c
+++ b/src/math-preferences.c
@@ -12,8 +12,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <glib/gi18n.h>
@@ -41,7 +41,7 @@ struct MathPreferencesDialogPrivate
MathPreferencesDialog *
math_preferences_dialog_new(MathEquation *equation)
-{
+{
return g_object_new (math_preferences_get_type(), "equation", equation, NULL);
}
@@ -211,7 +211,7 @@ word_size_cb(MathEquation *equation, GParamSpec *spec, MathPreferencesDialog *di
static void
angle_unit_cb(MathEquation *equation, GParamSpec *spec, MathPreferencesDialog *dialog)
{
- set_combo_box_from_int(GET_WIDGET(dialog->priv->ui, "angle_unit_combobox"), math_equation_get_angle_units(equation));
+ set_combo_box_from_int(GET_WIDGET(dialog->priv->ui, "angle_unit_combobox"), math_equation_get_angle_units(equation));
}
diff --git a/src/math-preferences.h b/src/math-preferences.h
index c816c31..ca7430e 100644
--- a/src/math-preferences.h
+++ b/src/math-preferences.h
@@ -12,8 +12,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#ifndef MATH_PREFERENCES_H
diff --git a/src/math-variables.c b/src/math-variables.c
index 47a672a..a76261c 100644
--- a/src/math-variables.c
+++ b/src/math-variables.c
@@ -12,8 +12,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <stdio.h>
diff --git a/src/math-variables.h b/src/math-variables.h
index dab20a0..e846ace 100644
--- a/src/math-variables.h
+++ b/src/math-variables.h
@@ -12,8 +12,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#ifndef MATH_VARIABLES_H
diff --git a/src/math-window.c b/src/math-window.c
index 4fbd6a5..2a90cfc 100644
--- a/src/math-window.c
+++ b/src/math-window.c
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <glib/gi18n.h>
diff --git a/src/math-window.h b/src/math-window.h
index cd180f6..463b078 100644
--- a/src/math-window.h
+++ b/src/math-window.h
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#ifndef MATH_WINDOW_H
diff --git a/src/mp-binary.c b/src/mp-binary.c
index f85b3ee..fd78c78 100644
--- a/src/mp-binary.c
+++ b/src/mp-binary.c
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <stdio.h>
diff --git a/src/mp-convert.c b/src/mp-convert.c
index 68be574..7ff2fca 100644
--- a/src/mp-convert.c
+++ b/src/mp-convert.c
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <stdlib.h>
@@ -295,7 +295,7 @@ mp_cast_to_int(const MPNumber *x)
{
int i;
int64_t z = 0, v;
-
+
/* |x| <= 1 */
if (x->sign == 0 || x->exponent <= 0)
return 0;
@@ -306,7 +306,7 @@ mp_cast_to_int(const MPNumber *x)
t = z;
z = z * MP_BASE + x->fraction[i];
-
+
/* Check for overflow */
if (z <= t)
return 0;
@@ -336,7 +336,7 @@ mp_cast_to_unsigned_int(const MPNumber *x)
{
int i;
uint64_t z = 0, v;
-
+
/* x <= 1 */
if (x->sign <= 0 || x->exponent <= 0)
return 0;
@@ -347,7 +347,7 @@ mp_cast_to_unsigned_int(const MPNumber *x)
t = z;
z = z * MP_BASE + x->fraction[i];
-
+
/* Check for overflow */
if (z <= t)
return 0;
@@ -837,7 +837,7 @@ mp_set_from_string(const char *str, int default_base, MPNumber *z)
const char *fractions[] = {"½", "⅓", "⅔", "¼", "¾", "⅕", "⅖", "⅗", "⅘", "⅙", "⅚", "⅛", "⅜", "⅝", "⅞", NULL};
int numerators[] = { 1, 1, 2, 1, 3, 1, 2, 3, 4, 1, 5, 1, 3, 5, 7};
int denominators[] = { 2, 3, 3, 4, 4, 5, 5, 5, 5, 6, 6, 8, 8, 8, 8};
-
+
if (strstr(str, "°"))
return set_from_sexagesimal(str, strlen(str), z);
diff --git a/src/mp-equation-lexer.l b/src/mp-equation-lexer.l
index 74eb7d5..6899f8f 100644
--- a/src/mp-equation-lexer.l
+++ b/src/mp-equation-lexer.l
@@ -21,8 +21,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <stdlib.h>
diff --git a/src/mp-equation-parser.y b/src/mp-equation-parser.y
index bb623cd..9de71e7 100644
--- a/src/mp-equation-parser.y
+++ b/src/mp-equation-parser.y
@@ -14,8 +14,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <stdio.h>
@@ -62,7 +62,7 @@ static int get_variable(yyscan_t yyscanner, const char *name, int power, MPNumbe
mp_xpowy_integer(z, power, z);
return 1;
}
-
+
/* If has more than one character then assume a multiplication of variables */
if (utf8_next_char(name)[0] != '\0') {
const char *c, *next;
@@ -118,7 +118,7 @@ static int get_inverse_function(yyscan_t yyscanner, const char *name, const MPNu
{
char *inv_name;
int result;
-
+
inv_name = malloc(sizeof(char) * (strlen(name) + strlen("⁻¹") + 1));
strcpy(inv_name, name);
strcat(inv_name, "⁻¹");
@@ -153,7 +153,7 @@ static char *make_unit(const char *name, int power)
name2 = malloc(sizeof(char) * (strlen(name) + strlen("?") + 1));
sprintf(name2, "%s?", name);
}
-
+
return name2;
}
diff --git a/src/mp-equation-private.h b/src/mp-equation-private.h
index 9885a8f..57c2431 100644
--- a/src/mp-equation-private.h
+++ b/src/mp-equation-private.h
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#ifndef MP_EQUATION_PRIVATE_H
diff --git a/src/mp-equation.c b/src/mp-equation.c
index 34f698b..cba203f 100644
--- a/src/mp-equation.c
+++ b/src/mp-equation.c
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <ctype.h>
@@ -250,7 +250,7 @@ do_convert(const char *units[][2], const MPNumber *x, const char *x_units, const
{
int x_index, z_index;
MPNumber x_factor, z_factor;
-
+
for (x_index = 0; units[x_index][0] != NULL && strcmp(units[x_index][0], x_units) != 0; x_index++);
if (units[x_index][0] == NULL)
return 0;
@@ -375,7 +375,7 @@ convert(MPEquationParserState *state, const MPNumber *x, const char *x_units, co
{"g", "0.001"},
{NULL, NULL}
};
-
+
const char *time_units[][2] = {
{"year", "31557600"},
{"years", "31557600"},
@@ -406,7 +406,7 @@ convert(MPEquationParserState *state, const MPNumber *x, const char *x_units, co
if (state->options->convert)
return state->options->convert(x, x_units, z_units, z, state->options->callback_data);
-
+
return 0;
}
diff --git a/src/mp-equation.h b/src/mp-equation.h
index c5b86fa..bb06de6 100644
--- a/src/mp-equation.h
+++ b/src/mp-equation.h
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#ifndef MP_EQUATION_H
diff --git a/src/mp-private.h b/src/mp-private.h
index 5e30bc3..f715b34 100644
--- a/src/mp-private.h
+++ b/src/mp-private.h
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#ifndef MP_INTERNAL_H
diff --git a/src/mp-trigonometric.c b/src/mp-trigonometric.c
index 2ebc676..4982041 100644
--- a/src/mp-trigonometric.c
+++ b/src/mp-trigonometric.c
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <stdlib.h>
@@ -420,7 +420,7 @@ mp_atan(const MPNumber *x, MPAngleUnit unit, MPNumber *z)
break;
q *= 2;
-
+
/* t = t / (√(t² + 1) + 1) */
mp_multiply(&t2, &t2, z);
mp_add_integer(z, 1, z);
diff --git a/src/mp.c b/src/mp.c
index 0e46b35..0037135 100644
--- a/src/mp.c
+++ b/src/mp.c
@@ -13,8 +13,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <stdlib.h>
@@ -212,8 +212,8 @@ mp_imaginary_component(const MPNumber *x, MPNumber *z)
z->sign = x->im_sign;
z->exponent = x->im_exponent;
memcpy(z->fraction, x->im_fraction, sizeof(int) * MP_SIZE);
-
- /* Clear (old) imaginary component */
+
+ /* Clear (old) imaginary component */
z->im_sign = 0;
z->im_exponent = 0;
memset(z->im_fraction, 0, sizeof(int) * MP_SIZE);
@@ -235,7 +235,7 @@ mp_add_real(const MPNumber *x, int y_sign, const MPNumber *y, MPNumber *z)
z->sign = y_sign;
return;
}
- /* x + 0 = x */
+ /* x + 0 = x */
else if (mp_is_zero(y)) {
mp_set_from_mp(x, z);
return;
@@ -450,7 +450,7 @@ mp_sgn(const MPNumber *x, MPNumber *z)
else if (mp_is_negative(x))
mp_set_from_integer(-1, z);
else
- mp_set_from_integer(1, z);
+ mp_set_from_integer(1, z);
}
void
@@ -829,7 +829,7 @@ bool
mp_is_integer(const MPNumber *x)
{
MPNumber t1, t2, t3;
-
+
if (mp_is_complex(x))
return false;
@@ -1303,7 +1303,7 @@ void
mp_logarithm(int64_t n, const MPNumber *x, MPNumber *z)
{
MPNumber t1, t2;
-
+
/* log(0) undefined */
if (mp_is_zero(x)) {
/* Translators: Error displayed when attempting to take logarithm of zero */
@@ -1333,7 +1333,7 @@ mp_multiply_real(const MPNumber *x, const MPNumber *y, MPNumber *z)
int c, i, xi;
MPNumber r;
- /* x*0 = 0*y = 0 */
+ /* x*0 = 0*y = 0 */
if (x->sign == 0 || y->sign == 0) {
mp_set_from_integer(0, z);
return;
@@ -1418,7 +1418,7 @@ mp_multiply_real(const MPNumber *x, const MPNumber *y, MPNumber *z)
/* Clear complex part */
z->im_sign = 0;
z->im_exponent = 0;
- memset(z->im_fraction, 0, sizeof(int) * MP_SIZE);
+ memset(z->im_fraction, 0, sizeof(int) * MP_SIZE);
/* NORMALIZE AND ROUND RESULT */
// FIXME: Use stack variable because of mp_normalize brokeness
@@ -1445,11 +1445,11 @@ mp_multiply(const MPNumber *x, const MPNumber *y, MPNumber *z)
mp_imaginary_component(x, &im_x);
mp_real_component(y, &real_y);
mp_imaginary_component(y, &im_y);
-
+
mp_multiply_real(&real_x, &real_y, &t1);
mp_multiply_real(&im_x, &im_y, &t2);
mp_subtract(&t1, &t2, &real_z);
-
+
mp_multiply_real(&real_x, &im_y, &t1);
mp_multiply_real(&im_x, &real_y, &t2);
mp_add(&t1, &t2, &im_z);
@@ -1574,7 +1574,7 @@ mp_multiply_integer_real(const MPNumber *x, int64_t y, MPNumber *z)
z->im_sign = 0;
z->im_exponent = 0;
- memset(z->im_fraction, 0, sizeof(int) * MP_SIZE);
+ memset(z->im_fraction, 0, sizeof(int) * MP_SIZE);
mp_normalize(z);
}
@@ -1746,7 +1746,7 @@ mp_reciprocal_real(const MPNumber *x, MPNumber *z)
void
mp_reciprocal(const MPNumber *x, MPNumber *z)
-{
+{
if (mp_is_complex(x)) {
MPNumber t1, t2;
MPNumber real_x, im_x;
@@ -2003,7 +2003,7 @@ mp_xpowy_integer(const MPNumber *x, int64_t n, MPNumber *z)
mp_set_from_integer(0, z);
return;
}
-
+
/* x^1 = x */
if (n == 1) {
mp_set_from_mp(x, z);
diff --git a/src/mp.h b/src/mp.h
index d7f226f..3f99c60 100644
--- a/src/mp.h
+++ b/src/mp.h
@@ -14,8 +14,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
/* This maths library is based on the MP multi-precision floating-point
diff --git a/src/unittest.c b/src/unittest.c
index e0ecdd7..d02ceea 100644
--- a/src/unittest.c
+++ b/src/unittest.c
@@ -12,8 +12,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#include <stdlib.h>
diff --git a/src/unittest.h b/src/unittest.h
index 7eee87d..5101b20 100644
--- a/src/unittest.h
+++ b/src/unittest.h
@@ -12,8 +12,8 @@
*
* 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
*/
#ifndef UNITTEST_H