Changes to be compatible with c89 standard

Author: iworker

clusterize.c

@@ -39,29 +39,32 @@ zend_module_entry clusterize_module_entry = {
     STANDARD_MODULE_PROPERTIES
 };
 
-ZEND_GET_MODULE(clusterize);
+ZEND_GET_MODULE(clusterize)
 
 PHP_FUNCTION(clusterize)
 {
-  zval *source_vectors;
+  zval *source_vectors, *point, *lat, *lon, clusters, values;
   zend_long clusters_count;
+  uint32_t i, n, r, part_size;
+  Point *points, *init;
+  kmeans_config config;
+  kmeans_result result;
+  HashTable *coordinates;
+  HashPosition pos;
 
   if (zend_parse_parameters(2 TSRMLS_CC, "al", &source_vectors, &clusters_count) == FAILURE) {
     RETURN_FALSE;
   }
 
-  uint32_t n = Z_ARRVAL_P(source_vectors)->nNumOfElements;
+  n = Z_ARRVAL_P(source_vectors)->nNumOfElements;
 
   if (n == 0 || clusters_count == 0) {
     RETURN_FALSE;
   }
 
-  Point *points = (Point *) ecalloc(n, sizeof(Point));
-
-  uint32_t i = 0;
-  zval *point;
-  HashPosition pos;
+  points = (Point *) ecalloc(n, sizeof(Point));
 
+  i = 0;
   ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(source_vectors), point)
   {
     if (Z_TYPE_P(point) != IS_ARRAY)
@@ -76,10 +79,10 @@ PHP_FUNCTION(clusterize)
       RETURN_FALSE;
     }
 
-    HashTable *coordinates = HASH_OF(point);
+    coordinates = HASH_OF(point);
 
-    zval *lat = zend_hash_index_find(coordinates, 0);
-    zval *lon = zend_hash_index_find(coordinates, 1);
+    lat = zend_hash_index_find(coordinates, 0);
+    lon = zend_hash_index_find(coordinates, 1);
 
     if (lat == NULL || lon == NULL)
     {
@@ -98,9 +101,6 @@ PHP_FUNCTION(clusterize)
     ++i;
   } ZEND_HASH_FOREACH_END();
 
-  kmeans_config config;
-  kmeans_result result;
-
   config.k = (uint32_t) clusters_count;
   config.num_objs = n;
   config.max_iterations = 200;
@@ -111,18 +111,18 @@ PHP_FUNCTION(clusterize)
   config.centers = ecalloc(config.k, sizeof(Pointer));
   config.clusters = ecalloc(config.num_objs, sizeof(int));
   config.clusters_sizes = ecalloc(config.k, sizeof(int));
-  Point *init = ecalloc(config.k, sizeof(Point));
+  init = ecalloc(config.k, sizeof(Point));
 
   for (i = 0; i < config.num_objs; ++i)
   {
     config.objs[i] = &(points[i]);
   }
 
-  int part_size = lroundf(config.num_objs / config.k);
+  part_size = lroundf(config.num_objs / config.k);
 
   for (i = 0; i < config.k; ++i)
   {
-    int r = i * part_size + lround(part_size * (1.0 * rand() / RAND_MAX));
+    r = i * part_size + lround(part_size * (1.0 * rand() / RAND_MAX));
 
     init[i] = points[r];
 
@@ -145,8 +145,6 @@ PHP_FUNCTION(clusterize)
 
   array_init_size(return_value, 2);
 
-  zval clusters;
-
   array_init_size(&clusters, config.k);
 
   for (i = 0; i < config.k; ++i)
@@ -165,8 +163,6 @@ PHP_FUNCTION(clusterize)
 
   add_next_index_zval(return_value, &clusters);
 
-  zval values;
-
   array_init_size(&values, config.num_objs);
 
   for (i = 0; i < config.num_objs; ++i)

kmeans.c

@@ -26,13 +26,12 @@
 static void update_r(kmeans_config *config)
 {
   int i;
+  double distance, curr_distance;
+  int cluster, curr_cluster;
+  Pointer obj;
 
   for (i = 0; i < config->num_objs; ++i)
   {
-    double distance, curr_distance;
-    int cluster, curr_cluster;
-    Pointer obj;
-
     obj = config->objs[i];
 
     /*
@@ -80,7 +79,7 @@ static void update_means(kmeans_config *config)
 
 kmeans_result kmeans(kmeans_config *config)
 {
-  int iterations = 0;
+  int iterations;
   int *clusters_last;
   size_t clusters_sz = sizeof(int) * config->num_objs;
   size_t clusters_size_sz = sizeof(int) * config->k;
@@ -105,6 +104,7 @@ kmeans_result kmeans(kmeans_config *config)
    */
   clusters_last = kmeans_malloc(clusters_sz);
 
+  iterations = 0;
   while(1)
   {
     /* Store the previous state of the clustering */

points.c

@@ -2,30 +2,35 @@
 
 double pt_distance(const Pointer a, const Pointer b)
 {
-  Point *pa = (Point*) a;
-  Point *pb = (Point*) b;
+  Point *pa, *pb;
+  double dx, dy;
 
-  double dx = (pa->x - pb->x);
-  double dy = (pa->y - pb->y);
+  pa = (Point*) a;
+  pb = (Point*) b;
+
+  dx = (pa->x - pb->x);
+  dy = (pa->y - pb->y);
 
   return dx * dx + dy * dy;
 }
 
 void pt_centroid(const Pointer *objs, const int *clusters, size_t num_objs, int cluster, Pointer centroid)
 {
   int i;
-  int num_cluster = 0;
+  int num_cluster;
+  Point sum, **pts, *center;
 
-  Point sum;
-  Point **pts = (Point**) objs;
-  Point *center = (Point*) centroid;
+  pts = (Point**) objs;
+  center = (Point*) centroid;
 
   sum.x = sum.y = 0.0;
 
   if (num_objs <= 0) {
     return;
   }
 
+  num_cluster = 0;
+
   for (i = 0; i < num_objs; ++i)
   {
     if (clusters[i] != cluster) {
@@ -44,6 +49,4 @@ void pt_centroid(const Pointer *objs, const int *clusters, size_t num_objs, int
     sum.y /= num_cluster;
     *center = sum;
   }
-
-  return;
 }