Small performance fixes

Removed some unnecessary checks
This commit is contained in:
Gergely Polonkai 2013-10-04 01:00:26 +02:00
parent bd54b5d37a
commit 20a350eacc
4 changed files with 16 additions and 52 deletions

View File

@ -239,11 +239,7 @@ gswe_aspect_data_set_planet2(GsweAspectData *aspect_data, GswePlanetData *planet
GswePlanetData * GswePlanetData *
gswe_aspect_data_get_planet2(GsweAspectData *aspect_data) gswe_aspect_data_get_planet2(GsweAspectData *aspect_data)
{ {
if (aspect_data) { return aspect_data->planet2;
return aspect_data->planet2;
} else {
return NULL;
}
} }
/** /**
@ -257,11 +253,7 @@ gswe_aspect_data_get_planet2(GsweAspectData *aspect_data)
gdouble gdouble
gswe_aspect_data_get_distance(GsweAspectData *aspect_data) gswe_aspect_data_get_distance(GsweAspectData *aspect_data)
{ {
if (aspect_data) { return aspect_data->distance;
return aspect_data->distance;
} else {
return -1.0;
}
} }
/** /**
@ -293,11 +285,7 @@ gswe_aspect_data_get_aspect(GsweAspectData *aspect_data)
GsweAspectInfo * GsweAspectInfo *
gswe_aspect_data_get_aspect_info(GsweAspectData *aspect_data) gswe_aspect_data_get_aspect_info(GsweAspectData *aspect_data)
{ {
if (aspect_data) { return aspect_data->aspect_info;
return aspect_data->aspect_info;
} else {
return NULL;
}
} }
/** /**
@ -311,10 +299,6 @@ gswe_aspect_data_get_aspect_info(GsweAspectData *aspect_data)
gdouble gdouble
gswe_aspect_data_get_difference(GsweAspectData *aspect_data) gswe_aspect_data_get_difference(GsweAspectData *aspect_data)
{ {
if (aspect_data) { return aspect_data->difference;
return aspect_data->difference;
} else {
return -1.0;
}
} }

View File

@ -42,13 +42,11 @@ G_DEFINE_BOXED_TYPE(GsweAspectInfo, gswe_aspect_info, (GBoxedCopyFunc)gswe_aspec
static void static void
gswe_aspect_info_free(GsweAspectInfo *aspect_info) gswe_aspect_info_free(GsweAspectInfo *aspect_info)
{ {
if (aspect_info) { if (aspect_info->name) {
if (aspect_info->name) { g_free(aspect_info->name);
g_free(aspect_info->name);
}
g_free(aspect_info);
} }
g_free(aspect_info);
} }
/** /**
@ -240,11 +238,7 @@ gswe_aspect_info_set_harmonic(GsweAspectInfo *aspect_info, gboolean harmonic)
gboolean gboolean
gswe_aspect_info_get_harmonic(GsweAspectInfo *aspect_info) gswe_aspect_info_get_harmonic(GsweAspectInfo *aspect_info)
{ {
if (aspect_info) { return aspect_info->harmonic;
return aspect_info->harmonic;
} else {
return FALSE;
}
} }
/** /**
@ -273,10 +267,6 @@ gswe_aspect_info_set_major(GsweAspectInfo *aspect_info, gboolean major)
gboolean gboolean
gswe_aspect_info_get_major(GsweAspectInfo *aspect_info) gswe_aspect_info_get_major(GsweAspectInfo *aspect_info)
{ {
if (aspect_info) { return aspect_info->major;
return aspect_info->major;
} else {
return FALSE;
}
} }

View File

@ -93,11 +93,7 @@ gswe_moon_phase_data_unref(GsweMoonPhaseData *moon_phase_data)
GsweMoonPhase GsweMoonPhase
gswe_moon_phase_data_get_phase(GsweMoonPhaseData *moon_phase_data) gswe_moon_phase_data_get_phase(GsweMoonPhaseData *moon_phase_data)
{ {
if (moon_phase_data) { return moon_phase_data->phase;
return moon_phase_data->phase;
} else {
return GSWE_MOON_PHASE_NONE;
}
} }
/** /**
@ -111,10 +107,6 @@ gswe_moon_phase_data_get_phase(GsweMoonPhaseData *moon_phase_data)
gdouble gdouble
gswe_moon_phase_data_get_illumination(GsweMoonPhaseData *moon_phase_data) gswe_moon_phase_data_get_illumination(GsweMoonPhaseData *moon_phase_data)
{ {
if (moon_phase_data) { return moon_phase_data->illumination;
return moon_phase_data->illumination;
} else {
return 0.0;
}
} }

View File

@ -35,13 +35,11 @@ G_DEFINE_BOXED_TYPE(GsweSignInfo, gswe_sign_info, (GBoxedCopyFunc)gswe_sign_info
static void static void
gswe_sign_info_free(GsweSignInfo *sign_info) gswe_sign_info_free(GsweSignInfo *sign_info)
{ {
if (sign_info) { if (sign_info->name) {
if (sign_info->name) { g_free(sign_info->name);
g_free(sign_info->name);
}
g_free(sign_info);
} }
g_free(sign_info);
} }
/** /**