aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2010-04-16 19:17:44 +0200
committerThomas White <taw@physics.org>2010-04-16 19:17:44 +0200
commitd0ef10cc38b8abda688d3024c6f60a8e9074cb7e (patch)
tree2a7b579e478922e0a8227a39811625648f49dfe0 /src
parent78746ef335facbab77765ecda7113b7a18417f91 (diff)
Tidy up, DS9K compatibility
Diffstat (limited to 'src')
-rw-r--r--src/cell.c24
-rw-r--r--src/cell.h2
2 files changed, 13 insertions, 13 deletions
diff --git a/src/cell.c b/src/cell.c
index e3b069bd..af56a8be 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -34,7 +34,7 @@ static void cell_update_cartesian(UnitCell *cell)
{
double tmp, V, cosalphastar, cstar;
- if ( !cell ) return;
+ if ( cell == NULL ) return;
/* a in terms of x, y and z
* +a (cryst) is defined to lie along +x (cart) */
@@ -69,7 +69,7 @@ static void cell_update_cartesian(UnitCell *cell)
/* Update the crystallographic representation from the cartesian one */
static void cell_update_crystallographic(UnitCell *cell)
{
- if ( !cell ) return;
+ if ( cell == NULL ) return;
cell->a = modulus(cell->ax, cell->ay, cell->az);
cell->b = modulus(cell->bx, cell->by, cell->bz);
@@ -89,7 +89,7 @@ UnitCell *cell_new()
UnitCell *cell;
cell = malloc(sizeof(UnitCell));
- if ( !cell ) return NULL;
+ if ( cell == NULL ) return NULL;
cell->a = 1.0;
cell->b = 1.0;
@@ -107,7 +107,7 @@ UnitCell *cell_new()
void cell_set_parameters(UnitCell *cell, double a, double b, double c,
double alpha, double beta, double gamma)
{
- if ( !cell ) return;
+ if ( cell == NULL ) return;
cell->a = a;
cell->b = b;
@@ -123,7 +123,7 @@ void cell_set_parameters(UnitCell *cell, double a, double b, double c,
void cell_get_parameters(UnitCell *cell, double *a, double *b, double *c,
double *alpha, double *beta, double *gamma)
{
- if ( !cell ) return;
+ if ( cell == NULL ) return;
*a = cell->a;
*b = cell->b;
@@ -141,7 +141,7 @@ void cell_set_cartesian(UnitCell *cell,
double bx, double by, double bz,
double cx, double cy, double cz)
{
- if ( !cell ) return;
+ if ( cell == NULL ) return;
cell->ax = ax; cell->ay = ay; cell->az = az;
cell->bx = bx; cell->by = by; cell->bz = bz;
@@ -153,7 +153,7 @@ void cell_set_cartesian(UnitCell *cell,
void cell_set_cartesian_a(UnitCell *cell, double ax, double ay, double az)
{
- if ( !cell ) return;
+ if ( cell == NULL ) return;
cell->ax = ax; cell->ay = ay; cell->az = az;
@@ -163,7 +163,7 @@ void cell_set_cartesian_a(UnitCell *cell, double ax, double ay, double az)
void cell_set_cartesian_b(UnitCell *cell, double bx, double by, double bz)
{
- if ( !cell ) return;
+ if ( cell == NULL ) return;
cell->bx = bx; cell->by = by; cell->bz = bz;
@@ -173,7 +173,7 @@ void cell_set_cartesian_b(UnitCell *cell, double bx, double by, double bz)
void cell_set_cartesian_c(UnitCell *cell, double cx, double cy, double cz)
{
- if ( !cell ) return;
+ if ( cell == NULL ) return;
cell->cx = cx; cell->cy = cy; cell->cz = cz;
@@ -187,7 +187,7 @@ UnitCell *cell_new_from_parameters(double a, double b, double c,
UnitCell *cell;
cell = cell_new();
- if ( !cell ) return NULL;
+ if ( cell == NULL ) return NULL;
cell_set_parameters(cell, a, b, c, alpha, beta, gamma);
@@ -207,7 +207,7 @@ static UnitCell *cell_new_from_axes(struct rvec as, struct rvec bs,
double angles[3];
cell = cell_new();
- if ( !cell ) return NULL;
+ if ( cell == NULL ) return NULL;
lengths[0] = modulus(as.u, as.v, as.w);
lengths[1] = modulus(bs.u, bs.v, bs.w);
@@ -316,7 +316,7 @@ void cell_get_cartesian(UnitCell *cell,
double *bx, double *by, double *bz,
double *cx, double *cy, double *cz)
{
- if ( !cell ) return;
+ if ( cell == NULL ) return;
*ax = cell->ax; *ay = cell->ay; *az = cell->az;
*bx = cell->bx; *by = cell->by; *bz = cell->bz;
diff --git a/src/cell.h b/src/cell.h
index a9f71fb9..ec8a063f 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -54,7 +54,7 @@ extern void cell_set_parameters(UnitCell *cell, double a, double b, double c,
double alpha, double beta, double gamma);
extern void cell_get_parameters(UnitCell *cell, double *a, double *b, double *c,
- double *alpha, double *beta, double *gamma);
+ double *alpha, double *beta, double *gamma);
extern void cell_get_cartesian(UnitCell *cell,
double *ax, double *ay, double *az,