if / if to if / else refactor

Author: kikitux

Dockerfile

@@ -1,6 +1,6 @@
-FROM	store/oracle/database-instantclient:12.2.0.1 
-ADD	scripts/preparecontainer.sh /
-RUN	bash /preparecontainer.sh
-ADD	scripts/build.sh /
-RUN	chmod +x /build.sh
-CMD	/build.sh
+FROM    store/oracle/database-instantclient:12.2.0.1 
+ADD     scripts/preparecontainer.sh /
+RUN     bash /preparecontainer.sh
+ADD     scripts/build.sh /
+RUN     chmod +x /build.sh
+CMD     /build.sh

create_function_toddog.sql

@@ -5,48 +5,48 @@ show err
 
 prompt create function f_metrictoddog
 CREATE OR REPLACE FUNCTION f_metrictoddog ( 
-   name IN VARCHAR2,
-   metric IN BINARY_INTEGER,
-   kind IN VARCHAR2,
-   tag IN VARCHAR2)  
+  name IN VARCHAR2,
+  metric IN BINARY_INTEGER,
+  kind IN VARCHAR2,
+  tag IN VARCHAR2)  
 RETURN VARCHAR2 AS LANGUAGE C 
 NAME "metrictoddog" 
 LIBRARY libtoddog
 WITH CONTEXT 
 PARAMETERS ( 
-CONTEXT,  
-name   	STRING,  
-name   	INDICATOR short,  
-metric	INT,  
-metric	INDICATOR short,  
-kind	STRING,  
-kind	INDICATOR short,  
-tag	STRING,  
-tag	INDICATOR short,  
-RETURN INDICATOR short,  
-RETURN LENGTH short,  
-RETURN STRING); 
+  CONTEXT,  
+  name    STRING,  
+  name    INDICATOR short,  
+  metric  INT,  
+  metric	INDICATOR short,  
+  kind    STRING,  
+  kind    INDICATOR short,  
+  tag     STRING,  
+  tag     INDICATOR short,  
+  RETURN  INDICATOR short,  
+  RETURN  LENGTH short,  
+  RETURN  STRING); 
 /
 show err
 
 CREATE OR REPLACE FUNCTION f_gaugetoddog(
-    name IN VARCHAR2,
-    metric IN number,
-    tag IN VARCHAR2)
+  name IN VARCHAR2,
+  metric IN number,
+  tag IN VARCHAR2)
 RETURN VARCHAR2 IS
 BEGIN
-    return f_metrictoddog(name,metric,'g',tag); 
+  return f_metrictoddog(name,metric,'g',tag);
 END;
 /
 show err
 
 CREATE OR REPLACE FUNCTION f_counttoddog(
-    name IN VARCHAR2,
-    metric IN number,
-    tag IN VARCHAR2)
+  name IN VARCHAR2,
+  metric IN number,
+  tag IN VARCHAR2)
 RETURN VARCHAR2 IS
 BEGIN
-    return f_metrictoddog(name,metric,'c',tag);
+  return f_metrictoddog(name,metric,'c',tag);
 END;
 /
 show err
@@ -98,5 +98,4 @@ END;
 /
 show err
 
-
-exit
+exit

src/toddog.c

@@ -3,82 +3,71 @@
 
 // to send a metric to ddog
 char *metrictoddog(
-        OCIExtProcContext *ctx,
-        char   *name,	 // pointer to name -- name of the metric
-        short  name_i,	 // null status of name
-        int    *metric,	 // pointer to metric -- number to be sent to the metric
-        short  metric_i, // null status of metric
-        char   *kind,	 // pointer to string1
-        short  kind_i,	 // null status of string1
-        char   *tag,	 // pointer to string1
-        short  tag_i,	 // null status of string1
-        short  *ret_i,	 // pointer to indicator null or not null
-        short  *ret_l	 // len of return
+  OCIExtProcContext *ctx,
+  char   *name,	    // pointer to name -- name of the metric
+  short  name_i,	  // null status of name
+  int    *metric,	  // pointer to metric -- number to be sent to the metric
+  short  metric_i,  // null status of metric
+  char   *kind,	    // pointer to string1
+  short  kind_i,	  // null status of string1
+  char   *tag,	    // pointer to string1
+  short  tag_i,	    // null status of string1
+  short  *ret_i,	  // pointer to indicator null or not null
+  short  *ret_l	    // len of return
 	)
 {
-    char *tmp;
-    short len;
-    char* metricname;
-    char* themetric;	 // to store the metric we will send to datadog
-    char* thekind;	 // to store the metric we will send to datadog
-
-    // Check for null inputs
-    if  (name_i == OCI_IND_NULL)
-    {
-        *ret_i = (short)OCI_IND_NULL;
-
-        // PL/SQL has no notion of a NULL ptr, so return a zero-byte string.
-        tmp = OCIExtProcAllocCallMemory(ctx, 1);
-        tmp[0] = '\0';
-
-        return(tmp);
-    }
-
-    // the main part
-    
-    strcat(metricname, name);
-
-    if  (kind_i == OCI_IND_NOTNULL)
-    {
-      asprintf(&thekind,"%s",kind);
-    }
-
-    if (kind_i == OCI_IND_NULL)
-    {
-      asprintf(&thekind,"%s","g");
-    }
-
-    if (tag_i == OCI_IND_NULL)
-    {
-      asprintf(&themetric,"%s:%d|%s|",metricname, metric, thekind);
-    }
+  char *tmp;
+  short len;
+  char* metricname;
+  char* themetric;  // to store the metric we will send to datadog
+  char* thekind;    // to store the kind we will send to datadog
+
+  // Check for null inputs
+  if (name_i == OCI_IND_NULL)
+  {
+    *ret_i = (short)OCI_IND_NULL;
+
+    // PL/SQL has no notion of a NULL ptr, so return a zero-byte string.
+    tmp = OCIExtProcAllocCallMemory(ctx, 1);
+    tmp[0] = '\0';
 
-    if  (tag_i == OCI_IND_NOTNULL)
-    {
-      asprintf(&themetric,"%s:%d|%s|#%s",metricname, metric, thekind,tag);
-    }
+    return(tmp);
+  }
 
-    udp(8125, themetric);
+  // the main part 
+  strcat(metricname, name);
 
+  if  (kind_i == OCI_IND_NOTNULL)
+  {
+    asprintf(&thekind,"%s",kind);
+  } else {
+    asprintf(&thekind,"%s","g");  // no kind, we default to gauge
+  }
 
-    // the reply part
-    // the text for return
+  if  (tag_i == OCI_IND_NOTNULL)
+  {
+    asprintf(&themetric,"%s:%d|%s|#%s",metricname, metric, thekind,tag);
+  } else {
+    asprintf(&themetric,"%s:%d|%s|",metricname, metric, thekind);
+  }
 
-    char *reply = "done";
+  udp(8125, themetric);         // we fire the metric to datadog
 
-    // Allocate memory for result string, including NULL terminator.
-    len = strlen(reply);
-    tmp = OCIExtProcAllocCallMemory(ctx, len + 1);
-    tmp[0] = '\0';
+  // the reply part
+  char *reply = "done";         // as udp is stateless, we assume all went fine
 
-    // set the reply
-    strcat(tmp, reply);
+  // Allocate memory for result string, including NULL terminator.
+  len = strlen(reply);
+  tmp = OCIExtProcAllocCallMemory(ctx, len + 1);
+  tmp[0] = '\0';
 
-    // Set NULL indicator and length.
-    *ret_i = (short)OCI_IND_NOTNULL;
-    *ret_l = len;
+  // set the reply
+  strcat(tmp, reply);
 
-    // Return pointer, which PL/SQL frees later.
-    return tmp;
-}
+  // Set ret indicator and length.
+  *ret_i = (short)OCI_IND_NOTNULL;
+  *ret_l = len;
 
+  // Return pointer, which PL/SQL frees later.
+  return tmp;
+}